diff --git a/contracts/package.json b/contracts/package.json index 08129af6..5a065f7f 100644 --- a/contracts/package.json +++ b/contracts/package.json @@ -2,22 +2,22 @@ "name": "@aragon/osx-commons-contracts", "license": "AGPL-3.0-or-later", "description": "The Aragon OSx contracts package containing common utilities", - "version": "1.4.0-alpha.4", + "version": "1.4.0-alpha.5", "author": { "name": "aragon", "url": "https://github.com/aragon" }, "devDependencies": { - "@aragon/osx-commons-sdk": "0.0.1-alpha.5", + "@aragon/osx-commons-sdk": "0.0.1-alpha.11", "@aragon/osx-commons-configs": "0.4.0", "@aragon/osx-ethers-v1.0.0": "npm:@aragon/osx-ethers@1.0.0", "@aragon/osx-ethers-v1.3.0": "npm:@aragon/osx-ethers@1.3.0", - "@ethersproject/abi": "^5.7.0", - "@ethersproject/abstract-signer": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/constants": "^5.7.0", - "@ethersproject/providers": "^5.7.2", + "@ethersproject/abi": "5.7.0", + "@ethersproject/abstract-signer": "5.7.0", + "@ethersproject/bignumber": "5.7.0", + "@ethersproject/bytes": "5.7.0", + "@ethersproject/constants": "5.7.0", + "@ethersproject/providers": "5.7.2", "@nomicfoundation/hardhat-chai-matchers": "^1.0.6", "@nomicfoundation/hardhat-network-helpers": "^1.0.10", "@nomicfoundation/hardhat-toolbox": "^2.0.2", @@ -32,7 +32,7 @@ "chai": "^4.3.7", "cross-env": "^7.0.3", "dotenv": "^16.3.1", - "ethers": "^5.7.2", + "ethers": "5.7.2", "hardhat": "^2.13.1", "hardhat-deploy": "^0.11.26", "hardhat-gas-reporter": "^1.0.9", diff --git a/contracts/test/plugin/extensions/proposal.ts b/contracts/test/plugin/extensions/proposal.ts index ddc92d56..d43d2bb1 100644 --- a/contracts/test/plugin/extensions/proposal.ts +++ b/contracts/test/plugin/extensions/proposal.ts @@ -11,12 +11,7 @@ import { } from '../../../typechain'; import {ExecutedEvent} from '../../../typechain/src/dao/IDAO'; import {erc165ComplianceTests} from '../../helpers'; -import { - IDAO_EVENTS, - IPROPOSAL_EVENTS, - findEventTopicLog, - getInterfaceId, -} from '@aragon/osx-commons-sdk'; +import {findEventTopicLog, getInterfaceId} from '@aragon/osx-commons-sdk'; import {IProposal__factory as IProposal_V1_0_0__factory} from '@aragon/osx-ethers-v1.0.0'; import {loadFixture, time} from '@nomicfoundation/hardhat-network-helpers'; import {SignerWithAddress} from '@nomiclabs/hardhat-ethers/signers'; @@ -117,7 +112,7 @@ function proposalBaseTests(fixture: () => Promise) { exampleData.allowFailureMap ) ) - .to.emit(proposalMock, IPROPOSAL_EVENTS.ProposalCreated) + .to.emit(proposalMock, 'ProposalCreated') .withArgs( expectedProposalId, creator.address, @@ -168,7 +163,7 @@ function proposalBaseTests(fixture: () => Promise) { exampleData.allowFailureMap ) ) - .to.emit(proposalMock, IPROPOSAL_EVENTS.ProposalExecuted) + .to.emit(proposalMock, 'ProposalExecuted') .withArgs(proposalId); }); @@ -195,10 +190,10 @@ function proposalBaseTests(fixture: () => Promise) { exampleData.actions, exampleData.allowFailureMap ); - const event = await findEventTopicLog( - tx, + const event = findEventTopicLog( + await tx.wait(), IDAO__factory.createInterface(), - IDAO_EVENTS.Executed + 'Executed' ); expect(event.args.actor).to.equal(expectedActor); diff --git a/contracts/test/plugin/plugin-clonable.ts b/contracts/test/plugin/plugin-clonable.ts index 04acd0d9..4166216e 100644 --- a/contracts/test/plugin/plugin-clonable.ts +++ b/contracts/test/plugin/plugin-clonable.ts @@ -14,12 +14,7 @@ import { } from '../../typechain/src/utils/deployment/ProxyFactory'; import {erc165ComplianceTests, getOzInitializedSlotValue} from '../helpers'; import {osxCommonsContractsVersion} from '../utils/versioning/protocol-version'; -import { - findEvent, - getInterfaceId, - PluginType, - PROXY_FACTORY_EVENTS, -} from '@aragon/osx-commons-sdk'; +import {PluginType, findEvent, getInterfaceId} from '@aragon/osx-commons-sdk'; import {loadFixture} from '@nomicfoundation/hardhat-network-helpers'; import {SignerWithAddress} from '@nomiclabs/hardhat-ethers/signers'; import {expect} from 'chai'; @@ -32,9 +27,9 @@ describe('PluginCloneable', function () { // Deploy an uninitialized clone const tx = await proxyFactory.deployMinimalProxy([]); - const event = await findEvent( - tx, - PROXY_FACTORY_EVENTS.ProxyCreated + const event = findEvent( + await tx.wait(), + 'ProxyCreated' ); const clone = Build1Factory.attach(event.args.proxy); diff --git a/contracts/test/plugin/plugin-uups-upgradeable.ts b/contracts/test/plugin/plugin-uups-upgradeable.ts index 0ec237cb..03501e8a 100644 --- a/contracts/test/plugin/plugin-uups-upgradeable.ts +++ b/contracts/test/plugin/plugin-uups-upgradeable.ts @@ -21,7 +21,6 @@ import { getInterfaceId, PLUGIN_UUPS_UPGRADEABLE_PERMISSIONS, PluginType, - PROXY_FACTORY_EVENTS, } from '@aragon/osx-commons-sdk'; import {loadFixture} from '@nomicfoundation/hardhat-network-helpers'; import {SignerWithAddress} from '@nomiclabs/hardhat-ethers/signers'; @@ -35,9 +34,9 @@ describe('PluginUUPSUpgradeable', function () { // Deploy an uninitialized proxy const tx = await proxyFactory.deployUUPSProxy([]); - const event = await findEvent( - tx, - PROXY_FACTORY_EVENTS.ProxyCreated + const event = findEvent( + await tx.wait(), + 'ProxyCreated' ); const proxy = Build1Factory.attach(event.args.proxy); @@ -145,9 +144,9 @@ describe('PluginUUPSUpgradeable', function () { // Deploy an uninitialized build 1 proxy const tx = await proxyFactory.deployUUPSProxy([]); - const event = await findEvent( - tx, - PROXY_FACTORY_EVENTS.ProxyCreated + const event = findEvent( + await tx.wait(), + 'ProxyCreated' ); const proxy = Build1Factory.attach(event.args.proxy); @@ -166,9 +165,9 @@ describe('PluginUUPSUpgradeable', function () { // Deploy an initialized build 1 proxy const tx = await proxyFactory.deployUUPSProxy(initCalldata); - const event = await findEvent( - tx, - PROXY_FACTORY_EVENTS.ProxyCreated + const event = findEvent( + await tx.wait(), + 'ProxyCreated' ); const proxy = Build1Factory.attach(event.args.proxy); @@ -200,9 +199,9 @@ describe('PluginUUPSUpgradeable', function () { // Create an initialized build 1 proxy const tx = await proxyFactory.deployUUPSProxy(initCalldata); - const event = await findEvent( - tx, - PROXY_FACTORY_EVENTS.ProxyCreated + const event = findEvent( + await tx.wait(), + 'ProxyCreated' ); const proxy = Build1Factory.attach(event.args.proxy); @@ -235,9 +234,9 @@ describe('PluginUUPSUpgradeable', function () { // Deploy an initialized build 1 proxy const tx = await proxyFactory.deployUUPSProxy(initCalldata); - const event = await findEvent( - tx, - PROXY_FACTORY_EVENTS.ProxyCreated + const event = findEvent( + await tx.wait(), + 'ProxyCreated' ); const proxy = Build1Factory.attach(event.args.proxy); diff --git a/contracts/test/plugin/setup/plugin-setup.ts b/contracts/test/plugin/setup/plugin-setup.ts index 8c2abead..cf31f453 100644 --- a/contracts/test/plugin/setup/plugin-setup.ts +++ b/contracts/test/plugin/setup/plugin-setup.ts @@ -11,7 +11,7 @@ import { import {IPluginSetup} from '../../../typechain/src/plugin/setup/PluginSetup'; import {erc165ComplianceTests} from '../../helpers'; import {osxCommonsContractsVersion} from '../../utils/versioning/protocol-version'; -import {ADDRESS, getInterfaceId} from '@aragon/osx-commons-sdk'; +import {getInterfaceId} from '@aragon/osx-commons-sdk'; import { IPluginSetup__factory as IPluginSetup_V1_0_0__factory, Plugin__factory, @@ -31,6 +31,10 @@ describe('IPluginSetup', function () { }); }); +const ADDRESS_ZERO = `0x${'0'.repeat(40)}`; +const ADDRESS_ONE = `0x${'0'.repeat(39)}1`; +const ADDRESS_TWO = `0x${'0'.repeat(39)}2`; + describe('PluginSetup', async () => { pluginSetupBaseTests(pluginSetupFixture); @@ -38,8 +42,8 @@ describe('PluginSetup', async () => { it('reverts when called', async () => { const {pluginSetupMock} = await loadFixture(pluginSetupFixture); - const dummyDaoAddr = ADDRESS.ONE; - const dummyPluginAddr = ADDRESS.TWO; + const dummyDaoAddr = ADDRESS_ONE; + const dummyPluginAddr = ADDRESS_TWO; const dummyFromBuildNumber = 123; const setupPayload: IPluginSetup.SetupPayloadStruct = { plugin: dummyPluginAddr, @@ -69,8 +73,8 @@ describe('PluginUpgradeableSetup', async () => { pluginUUPSUpgradeableSetupFixture ); - const dummyDaoAddr = ADDRESS.ONE; - const dummyPluginAddr = ADDRESS.TWO; + const dummyDaoAddr = ADDRESS_ONE; + const dummyPluginAddr = ADDRESS_TWO; const setupPayload: IPluginSetup.SetupPayloadStruct = { plugin: dummyPluginAddr, currentHelpers: [], @@ -97,8 +101,8 @@ describe('PluginUpgradeableSetup', async () => { deployer ).deploy(); - const dummyDaoAddr = ADDRESS.ONE; - const dummyPluginAddr = ADDRESS.TWO; + const dummyDaoAddr = ADDRESS_ONE; + const dummyPluginAddr = ADDRESS_TWO; const dummyFromBuildNumber = 123; const setupPayload: IPluginSetup.SetupPayloadStruct = { plugin: dummyPluginAddr, @@ -124,7 +128,7 @@ function pluginSetupBaseTests(fixture: () => Promise) { const implementation = await pluginSetupMock.implementation(); // Check that an address is returned - expect(implementation).to.not.equal(ADDRESS.ZERO); + expect(implementation).to.not.equal(ADDRESS_ZERO); // Check that it supports the `IPlugin` interface const plugin = Plugin__factory.connect(implementation, deployer); diff --git a/contracts/test/utils/deployment/proxy-lib.ts b/contracts/test/utils/deployment/proxy-lib.ts index 8c690d6c..6310966a 100644 --- a/contracts/test/utils/deployment/proxy-lib.ts +++ b/contracts/test/utils/deployment/proxy-lib.ts @@ -7,16 +7,15 @@ import { ProxyFactory__factory, } from '../../../typechain'; import {ProxyCreatedEvent} from '../../../typechain/src/utils/deployment/ProxyFactory'; -import { - ADDRESS, - findEvent, - PROXY_FACTORY_EVENTS, -} from '@aragon/osx-commons-sdk'; +import {findEvent} from '@aragon/osx-commons-sdk'; import {loadFixture} from '@nomicfoundation/hardhat-network-helpers'; import {SignerWithAddress} from '@nomiclabs/hardhat-ethers/signers'; import {expect} from 'chai'; import {ethers} from 'hardhat'; +const ADDRESS_ZERO = `0x${'0'.repeat(40)}`; +const ADDRESS_LAST = `0x${'f'.repeat(40)}`; + describe('ProxyFactory', function () { describe('deployUUPSProxy', function () { it('deploys an initialized proxy if initialization data is provided', async () => { @@ -32,9 +31,9 @@ describe('ProxyFactory', function () { const tx = await proxyFactory.deployUUPSProxy(initCalldata); // Get the proxy address from the event - const event = await findEvent( - tx, - PROXY_FACTORY_EVENTS.ProxyCreated + const event = findEvent( + await tx.wait(), + 'ProxyCreated' ); const proxy = PluginUUPSUpgradeableMockBuild1__factory.connect( event.args.proxy, @@ -61,8 +60,8 @@ describe('ProxyFactory', function () { // Get the proxy address from the event const event = await findEvent( - tx, - PROXY_FACTORY_EVENTS.ProxyCreated + await tx.wait(), + 'ProxyCreated' ); const proxy = PluginUUPSUpgradeableMockBuild1__factory.connect( event.args.proxy, @@ -75,7 +74,7 @@ describe('ProxyFactory', function () { .to.equal(implementation.address); // Check that the proxy is not initialized - expect(await proxy.dao()).to.equal(ADDRESS.ZERO); + expect(await proxy.dao()).to.equal(ADDRESS_ZERO); expect(await proxy.state1()).to.equal(0); }); }); @@ -89,9 +88,9 @@ describe('ProxyFactory', function () { const tx = await proxyFactory.deployMinimalProxy(initCalldata); // Get the proxy address from the event - const event = await findEvent( - tx, - PROXY_FACTORY_EVENTS.ProxyCreated + const event = findEvent( + await tx.wait(), + 'ProxyCreated' ); const proxy = PluginCloneableMockBuild1__factory.connect( event.args.proxy, @@ -111,8 +110,8 @@ describe('ProxyFactory', function () { // Get the proxy address from the event const event = await findEvent( - tx, - PROXY_FACTORY_EVENTS.ProxyCreated + await tx.wait(), + 'ProxyCreated' ); const proxy = PluginCloneableMockBuild1__factory.connect( event.args.proxy, @@ -120,7 +119,7 @@ describe('ProxyFactory', function () { ); // Check that the proxy is not initialized - expect(await proxy.dao()).to.equal(ADDRESS.ZERO); + expect(await proxy.dao()).to.equal(ADDRESS_ZERO); expect(await proxy.state1()).to.equal(0); }); }); @@ -146,7 +145,7 @@ async function uupsProxyFixture(): Promise { ); // Create a mock address with a valid checksum - const daoMockAddr = ethers.utils.getAddress(ADDRESS.LAST); + const daoMockAddr = ethers.utils.getAddress(ADDRESS_LAST); const initCalldata = implementation.interface.encodeFunctionData( 'initialize', @@ -168,7 +167,7 @@ async function minimalProxyFixture(): Promise { ); // Create a mock address with a valid checksum - const daoMockAddr = ethers.utils.getAddress(ADDRESS.LAST); + const daoMockAddr = ethers.utils.getAddress(ADDRESS_LAST); const initCalldata = implementation.interface.encodeFunctionData( 'initialize', diff --git a/contracts/yarn.lock b/contracts/yarn.lock index 166c6949..d231a7bd 100644 --- a/contracts/yarn.lock +++ b/contracts/yarn.lock @@ -2,32 +2,26 @@ # yarn lockfile v1 -"@aragon/osx-commons-configs@0.4.0": +"@aragon/osx-commons-configs@0.4.0", "@aragon/osx-commons-configs@^0.4.0": version "0.4.0" resolved "https://registry.yarnpkg.com/@aragon/osx-commons-configs/-/osx-commons-configs-0.4.0.tgz#5b6ae025de1ccf7f9a135bfbcb0aa822c774acf9" integrity sha512-/2wIQCbv/spMRdOjRXK0RrXG1TK5aMcbD73RvMgMwQwSrKcA1dCntUuSxmTm2W8eEtOzs8E1VPjqZk0cXL4SSQ== dependencies: tslib "^2.6.2" -"@aragon/osx-commons-sdk@0.0.1-alpha.5": - version "0.0.1-alpha.5" - resolved "https://registry.yarnpkg.com/@aragon/osx-commons-sdk/-/osx-commons-sdk-0.0.1-alpha.5.tgz#9808e7c6a441af6459f96016abe07812706d97bf" - integrity sha512-GyErC61lMckZyG17BZPgPWMkY3phZGdzZHMP17mUyE6vFhth9at5HKhNBi7bWB0eNkcM9RrQksIWHjmSHbW3ug== +"@aragon/osx-commons-sdk@0.0.1-alpha.11": + version "0.0.1-alpha.11" + resolved "https://registry.yarnpkg.com/@aragon/osx-commons-sdk/-/osx-commons-sdk-0.0.1-alpha.11.tgz#1e3e39aac3351b6649921a5e373a5146b86b2c92" + integrity sha512-/FgTLnS73QY0JxZYQlHwpd2ZuMPkPKdIlci9T4jgH9E4Eyyxh6GX7fJK+HekCcf6oMS5tTZ/Cb3sVyyzoO95iw== dependencies: - "@aragon/osx-ethers" "^1.3.0-rc0.4" - "@aragon/osx-ethers-v1.0.0" "npm:@aragon/osx-ethers@1.2.1" - "@aragon/sdk-ipfs" "^1.1.0" - "@ethersproject/abstract-signer" "^5.7.0" - "@ethersproject/bignumber" "^5.7.0" - "@ethersproject/constants" "^5.7.0" - "@ethersproject/contracts" "^5.7.0" - "@ethersproject/hash" "^5.7.0" - "@ethersproject/providers" "^5.7.2" - "@ethersproject/wallet" "^5.7.0" - graphql "^16.5.0" - graphql-request "^4.3.0" + "@aragon/osx-commons-configs" "^0.4.0" + "@ethersproject/address" "5.7.0" + "@ethersproject/bignumber" "5.7.0" + "@ethersproject/contracts" "5.7.0" + "@ethersproject/hash" "5.7.0" + "@ethersproject/logger" "5.7.0" + "@ethersproject/providers" "5.7.2" ipfs-http-client "^51.0.0" - yup "^1.2.0" "@aragon/osx-ethers-v1.0.0@npm:@aragon/osx-ethers@1.0.0": version "1.0.0" @@ -36,30 +30,13 @@ dependencies: ethers "^5.6.2" -"@aragon/osx-ethers-v1.0.0@npm:@aragon/osx-ethers@1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@aragon/osx-ethers/-/osx-ethers-1.2.1.tgz#a442048137153ed5a3ca4eff3f3927b45a5134b5" - integrity sha512-3Fscq8C9elIktiI6OT7fR5iaAvim+ghU6IUvZF3P/phvWm9roNp/GXAROhA/Vx41NQxeqmfXokgFo6KOWt4drA== - dependencies: - ethers "^5.6.2" - -"@aragon/osx-ethers-v1.3.0@npm:@aragon/osx-ethers@1.3.0", "@aragon/osx-ethers@^1.3.0-rc0.4": +"@aragon/osx-ethers-v1.3.0@npm:@aragon/osx-ethers@1.3.0": version "1.3.0" resolved "https://registry.yarnpkg.com/@aragon/osx-ethers/-/osx-ethers-1.3.0.tgz#85ddd93f4448789e94154b313f9ddd8069dff568" integrity sha512-zfLAYdgZ3SSifHiyJLkBKmoDw/IEX/yzvw6liUAa/gz7HZOsrwp3JsBJaIwB2epOnGa6vhXyWTKKZ15aJvoMaA== dependencies: ethers "^5.6.2" -"@aragon/sdk-ipfs@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@aragon/sdk-ipfs/-/sdk-ipfs-1.1.0.tgz#178ee5ce840ce40b44ba0345dd5068e1b5608f9d" - integrity sha512-2uAh/QPcmaita4AfHYV93lESzAhrmGEZ6CL7pvOH86HTkU6j7LnePvD1ly+x0hxRznTb+zgVgSPPKUn0ArPycw== - dependencies: - "@web-std/fetch" "^4.1.0" - "@web-std/file" "^3.0.2" - "@web-std/form-data" "^3.0.2" - isomorphic-unfetch "^3.1.0" - "@aws-crypto/sha256-js@1.2.2": version "1.2.2" resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-js/-/sha256-js-1.2.2.tgz#02acd1a1fda92896fc5a28ec7c6e164644ea32fc" @@ -1258,66 +1235,6 @@ dependencies: "@types/node" "*" -"@web-std/blob@^3.0.3": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@web-std/blob/-/blob-3.0.5.tgz#391e652dd3cc370dbb32c828368a3022b4d55c9c" - integrity sha512-Lm03qr0eT3PoLBuhkvFBLf0EFkAsNz/G/AYCzpOdi483aFaVX86b4iQs0OHhzHJfN5C15q17UtDbyABjlzM96A== - dependencies: - "@web-std/stream" "1.0.0" - web-encoding "1.1.5" - -"@web-std/fetch@^4.1.0": - version "4.2.1" - resolved "https://registry.yarnpkg.com/@web-std/fetch/-/fetch-4.2.1.tgz#692c5545787081217fce3c024708fa8979c21f9c" - integrity sha512-M6sgHDgKegcjuVsq8J6jb/4XvhPGui8uwp3EIoADGXUnBl9vKzKLk9H9iFzrPJ6fSV6zZzFWXPyziBJp9hxzBA== - dependencies: - "@web-std/blob" "^3.0.3" - "@web-std/file" "^3.0.2" - "@web-std/form-data" "^3.0.2" - "@web-std/stream" "^1.0.1" - "@web3-storage/multipart-parser" "^1.0.0" - abort-controller "^3.0.0" - data-uri-to-buffer "^3.0.1" - mrmime "^1.0.0" - -"@web-std/file@^3.0.2": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@web-std/file/-/file-3.0.3.tgz#a29b9164d34155a126d1ab2af5e5867e83c8b098" - integrity sha512-X7YYyvEERBbaDfJeC9lBKC5Q5lIEWYCP1SNftJNwNH/VbFhdHm+3neKOQP+kWEYJmosbDFq+NEUG7+XIvet/Jw== - dependencies: - "@web-std/blob" "^3.0.3" - -"@web-std/form-data@^3.0.2": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@web-std/form-data/-/form-data-3.1.0.tgz#573b40f6296e8bdba31f1bbf2db398f104ef4831" - integrity sha512-WkOrB8rnc2hEK2iVhDl9TFiPMptmxJA1HaIzSdc2/qk3XS4Ny4cCt6/V36U3XmoYKz0Md2YyK2uOZecoZWPAcA== - dependencies: - web-encoding "1.1.5" - -"@web-std/stream@1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@web-std/stream/-/stream-1.0.0.tgz#01066f40f536e4329d9b696dc29872f3a14b93c1" - integrity sha512-jyIbdVl+0ZJyKGTV0Ohb9E6UnxP+t7ZzX4Do3AHjZKxUXKMs9EmqnBDQgHF7bEw0EzbQygOjtt/7gvtmi//iCQ== - dependencies: - web-streams-polyfill "^3.1.1" - -"@web-std/stream@^1.0.1": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@web-std/stream/-/stream-1.0.3.tgz#a1df4d4612990d3607f77ad17d0338c7960bbe2e" - integrity sha512-5MIngxWyq4rQiGoDAC2WhjLuDraW8+ff2LD2et4NRY933K3gL8CHlUXrh8ZZ3dC9A9Xaub8c9sl5exOJE58D9Q== - dependencies: - web-streams-polyfill "^3.1.1" - -"@web3-storage/multipart-parser@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@web3-storage/multipart-parser/-/multipart-parser-1.0.0.tgz#6b69dc2a32a5b207ba43e556c25cc136a56659c4" - integrity sha512-BEO6al7BYqcnfX15W2cnGR+Q566ACXAT9UQykORCWW80lmkpWsnEob6zJS1ZVBKsSJC8+7vJkHwlp+lXG1UCdw== - -"@zxing/text-encoding@0.9.0": - version "0.9.0" - resolved "https://registry.yarnpkg.com/@zxing/text-encoding/-/text-encoding-0.9.0.tgz#fb50ffabc6c7c66a0c96b4c03e3d9be74864b70b" - integrity sha512-U/4aVJ2mxI0aDNI8Uq0wEhMgY+u4CNtEb0om3+y3+niDAsoTCOB33UF0sxpzqzdqXLqmvc+vZyAt4O8pPdfkwA== - abbrev@1: version "1.1.1" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" @@ -2084,13 +2001,6 @@ cross-env@^7.0.3: dependencies: cross-spawn "^7.0.1" -cross-fetch@^3.1.5: - version "3.1.8" - resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.8.tgz#0327eba65fd68a7d119f8fb2bf9334a1a7956f82" - integrity sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg== - dependencies: - node-fetch "^2.6.12" - cross-spawn@^7.0.0, cross-spawn@^7.0.1: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" @@ -2105,11 +2015,6 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.1: resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b" integrity sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow== -data-uri-to-buffer@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz#594b8973938c5bc2c33046535785341abc4f3636" - integrity sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og== - death@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/death/-/death-1.1.0.tgz#01aa9c401edd92750514470b8266390c66c67318" @@ -2499,7 +2404,7 @@ ethereumjs-util@^7.0.3, ethereumjs-util@^7.1.4: ethereum-cryptography "^0.1.3" rlp "^2.2.4" -ethers@^5.6.2, ethers@^5.7.0, ethers@^5.7.1, ethers@^5.7.2: +ethers@5.7.2, ethers@^5.6.2, ethers@^5.7.0, ethers@^5.7.1, ethers@^5.7.2: version "5.7.2" resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.7.2.tgz#3a7deeabbb8c030d4126b24f84e525466145872e" integrity sha512-wswUsmWo1aOK8rR7DIKiWSw9DbLWe6x98Jrn8wcTflTVvaXhAMaB5zGAXy0GYQEQp9iO1iSHWVyARQm11zUtyg== @@ -2564,11 +2469,6 @@ evp_bytestokey@^1.0.3: md5.js "^1.3.4" safe-buffer "^5.1.1" -extract-files@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/extract-files/-/extract-files-9.0.0.tgz#8a7744f2437f81f5ed3250ed9f1550de902fe54a" - integrity sha512-CvdFfHkC95B4bBBk36hcEmvdR2awOdhhVUYH6S/zrVj3477zven/fJMYg7121h4T1xHZC+tetUpubpAhxwI7hQ== - fast-base64-decode@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fast-base64-decode/-/fast-base64-decode-1.0.0.tgz#b434a0dd7d92b12b43f26819300d2dafb83ee418" @@ -2677,15 +2577,6 @@ form-data@^2.2.0: combined-stream "^1.0.6" mime-types "^2.1.12" -form-data@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f" - integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.8" - mime-types "^2.1.12" - form-data@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" @@ -2953,20 +2844,6 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== -graphql-request@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/graphql-request/-/graphql-request-4.3.0.tgz#b934e08fcae764aa2cdc697d3c821f046cb5dbf2" - integrity sha512-2v6hQViJvSsifK606AliqiNiijb1uwWp6Re7o0RTyH+uRTv/u7Uqm2g4Fjq/LgZIzARB38RZEvVBFOQOVdlBow== - dependencies: - cross-fetch "^3.1.5" - extract-files "^9.0.0" - form-data "^3.0.0" - -graphql@^16.5.0: - version "16.8.1" - resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.8.1.tgz#1930a965bef1170603702acdb68aedd3f3cf6f07" - integrity sha512-59LZHPdGZVh695Ud9lRzPBVTtlX9ZCV150Er2W43ro37wVof0ctenSaskPPjN7lVTIN8mSZt8PHUNKZuNQUuxw== - handlebars@^4.0.1, handlebars@^4.7.7: version "4.7.8" resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.8.tgz#41c42c18b1be2365439188c77c6afae71c0cd9e9" @@ -3386,14 +3263,6 @@ ipfs-utils@^8.1.2, ipfs-utils@^8.1.4: react-native-fetch-api "^2.0.0" stream-to-it "^0.2.2" -is-arguments@^1.0.4: - version "1.1.1" - resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" - integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA== - dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" - is-array-buffer@^3.0.1, is-array-buffer@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe" @@ -3469,13 +3338,6 @@ is-fullwidth-code-point@^3.0.0: resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== -is-generator-function@^1.0.7: - version "1.0.10" - resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72" - integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A== - dependencies: - has-tostringtag "^1.0.0" - is-glob@^4.0.1, is-glob@~4.0.1: version "4.0.3" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" @@ -3546,7 +3408,7 @@ is-symbol@^1.0.2, is-symbol@^1.0.3: dependencies: has-symbols "^1.0.2" -is-typed-array@^1.1.10, is-typed-array@^1.1.12, is-typed-array@^1.1.3, is-typed-array@^1.1.9: +is-typed-array@^1.1.10, is-typed-array@^1.1.12, is-typed-array@^1.1.9: version "1.1.12" resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.12.tgz#d0bab5686ef4a76f7a73097b95470ab199c57d4a" integrity sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg== @@ -3590,7 +3452,7 @@ iso-url@^1.1.5: resolved "https://registry.yarnpkg.com/iso-url/-/iso-url-1.2.1.tgz#db96a49d8d9a64a1c889fc07cc525d093afb1811" integrity sha512-9JPDgCN4B7QPkLtYAAOrEuAWvP9rWvR5offAr0/SeF046wIkglqH3VXgYYP6NcsKslH80UIVgmPqNe3j7tG2ng== -isomorphic-unfetch@^3.0.0, isomorphic-unfetch@^3.1.0: +isomorphic-unfetch@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/isomorphic-unfetch/-/isomorphic-unfetch-3.1.0.tgz#87341d5f4f7b63843d468438128cb087b7c3e98f" integrity sha512-geDJjpoZ8N0kWexiwkX8F9NkTsXhetLPVbZFQ+JTW239QNOwvB0gniuR1Wc6f0AMTn7/mFGyXvHTifrCp/GH8Q== @@ -4052,11 +3914,6 @@ module-error@^1.0.1, module-error@^1.0.2: resolved "https://registry.yarnpkg.com/module-error/-/module-error-1.0.2.tgz#8d1a48897ca883f47a45816d4fb3e3c6ba404d86" integrity sha512-0yuvsqSCv8LbaOKhnsQ/T5JhyFlCYLPXK3U2sgV10zoKQwzs/MyfuQUOZQ1V/6OCOJsK/TRgNVrPuPDqtdMFtA== -mrmime@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-1.0.1.tgz#5f90c825fad4bdd41dc914eff5d1a8cfdaf24f27" - integrity sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw== - ms@2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" @@ -4142,7 +3999,7 @@ node-emoji@^1.10.0: dependencies: lodash "^4.17.21" -node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@^2.6.12: +node-fetch@^2.6.0, node-fetch@^2.6.1: version "2.7.0" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d" integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A== @@ -4400,11 +4257,6 @@ proper-lockfile@^4.1.1: retry "^0.12.0" signal-exit "^3.0.2" -property-expr@^2.0.5: - version "2.0.6" - resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-2.0.6.tgz#f77bc00d5928a6c748414ad12882e83f24aec1e8" - integrity sha512-SVtmxhRE/CGkn3eZY1T6pC8Nln6Fr/lu1mKSgRud0eC73whjGfoAogbn78LkD8aFL0zz3bAFerKSnOl7NlErBA== - protobufjs@^6.10.2: version "6.11.4" resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.4.tgz#29a412c38bf70d89e537b6d02d904a6f448173aa" @@ -5150,11 +5002,6 @@ timeout-abort-controller@^1.1.1: abort-controller "^3.0.0" retimer "^2.0.0" -tiny-case@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/tiny-case/-/tiny-case-1.0.3.tgz#d980d66bc72b5d5a9ca86fb7c9ffdb9c898ddd03" - integrity sha512-Eet/eeMhkO6TX8mnUteS9zgPbUMQa4I6Kkp5ORiBD5476/m+PIRiumP5tmh5ioJpH7k51Kehawy2UDfsnxxY8Q== - tmp-promise@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.3.tgz#60a1a1cc98c988674fcbfd23b6e3367bdeac4ce7" @@ -5188,11 +5035,6 @@ toidentifier@1.0.1: resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== -toposort@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330" - integrity sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg== - tr46@~0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" @@ -5279,11 +5121,6 @@ type-fest@^0.7.1: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.7.1.tgz#8dda65feaf03ed78f0a3f9678f1869147f7c5c48" integrity sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg== -type-fest@^2.19.0: - version "2.19.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.19.0.tgz#88068015bb33036a598b952e55e9311a60fd3a9b" - integrity sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA== - typechain@^8.3.2: version "8.3.2" resolved "https://registry.yarnpkg.com/typechain/-/typechain-8.3.2.tgz#1090dd8d9c57b6ef2aed3640a516bdbf01b00d73" @@ -5442,17 +5279,6 @@ util-deprecate@^1.0.1, util-deprecate@~1.0.1: resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== -util@^0.12.3: - version "0.12.5" - resolved "https://registry.yarnpkg.com/util/-/util-0.12.5.tgz#5f17a6059b73db61a875668781a1c2b136bd6fbc" - integrity sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA== - dependencies: - inherits "^2.0.3" - is-arguments "^1.0.4" - is-generator-function "^1.0.7" - is-typed-array "^1.1.3" - which-typed-array "^1.1.2" - uuid@^8.3.2: version "8.3.2" resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" @@ -5468,20 +5294,6 @@ varint@^6.0.0: resolved "https://registry.yarnpkg.com/varint/-/varint-6.0.0.tgz#9881eb0ce8feaea6512439d19ddf84bf551661d0" integrity sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg== -web-encoding@1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/web-encoding/-/web-encoding-1.1.5.tgz#fc810cf7667364a6335c939913f5051d3e0c4864" - integrity sha512-HYLeVCdJ0+lBYV2FvNZmv3HJ2Nt0QYXqZojk3d9FJOLkwnuhzM9tmamh8d7HPM8QqjKH8DeHkFTx+CFlWpZZDA== - dependencies: - util "^0.12.3" - optionalDependencies: - "@zxing/text-encoding" "0.9.0" - -web-streams-polyfill@^3.1.1: - version "3.3.2" - resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.3.2.tgz#32e26522e05128203a7de59519be3c648004343b" - integrity sha512-3pRGuxRF5gpuZc0W+EpwQRmCD7gRqcDOMt688KmdlDAgAyaB1XlN0zq2njfDNm44XVdIouE7pZ6GzbdyH47uIQ== - web3-utils@^1.3.6: version "1.10.3" resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.10.3.tgz#f1db99c82549c7d9f8348f04ffe4e0188b449714" @@ -5520,7 +5332,7 @@ which-boxed-primitive@^1.0.2: is-string "^1.0.5" is-symbol "^1.0.3" -which-typed-array@^1.1.11, which-typed-array@^1.1.2: +which-typed-array@^1.1.11: version "1.1.13" resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.13.tgz#870cd5be06ddb616f504e7b039c4c24898184d36" integrity sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow== @@ -5659,16 +5471,6 @@ yocto-queue@^0.1.0: resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== -yup@^1.2.0: - version "1.3.3" - resolved "https://registry.yarnpkg.com/yup/-/yup-1.3.3.tgz#d2f6020ad1679754c5f8178a29243d5447dead04" - integrity sha512-v8QwZSsHH2K3/G9WSkp6mZKO+hugKT1EmnMqLNUcfu51HU9MDyhlETT/JgtzprnrnQHPWsjc6MUDMBp/l9fNnw== - dependencies: - property-expr "^2.0.5" - tiny-case "^1.0.3" - toposort "^2.0.2" - type-fest "^2.19.0" - zksync-web3@^0.14.3: version "0.14.3" resolved "https://registry.yarnpkg.com/zksync-web3/-/zksync-web3-0.14.3.tgz#64ac2a16d597464c3fc4ae07447a8007631c57c9"