diff --git a/contracts/contracts/ClrFund.sol b/contracts/contracts/ClrFund.sol index f765bab53..45014b3cc 100644 --- a/contracts/contracts/ClrFund.sol +++ b/contracts/contracts/ClrFund.sol @@ -6,10 +6,10 @@ import '@openzeppelin/contracts/token/ERC20/ERC20.sol'; import '@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol'; import '@openzeppelin/contracts/utils/structs/EnumerableSet.sol'; -import {SignUpGatekeeper} from "maci-contracts/contracts/gatekeepers/SignUpGatekeeper.sol"; -import {InitialVoiceCreditProxy} from "maci-contracts/contracts/initialVoiceCreditProxy/InitialVoiceCreditProxy.sol"; -import {PollFactory} from 'maci-contracts/contracts/Poll.sol'; -import {Params} from 'maci-contracts/contracts/Params.sol'; +import {SignUpGatekeeper} from "@clrfund/maci-contracts/contracts/gatekeepers/SignUpGatekeeper.sol"; +import {InitialVoiceCreditProxy} from "@clrfund/maci-contracts/contracts/initialVoiceCreditProxy/InitialVoiceCreditProxy.sol"; +import {PollFactory} from '@clrfund/maci-contracts/contracts/Poll.sol'; +import {Params} from '@clrfund/maci-contracts/contracts/Params.sol'; import './MACIFactory.sol'; import './userRegistry/IUserRegistry.sol'; diff --git a/contracts/contracts/ClrFundDeployer.sol b/contracts/contracts/ClrFundDeployer.sol index 463dd7c50..06dfd31e6 100644 --- a/contracts/contracts/ClrFundDeployer.sol +++ b/contracts/contracts/ClrFundDeployer.sol @@ -5,8 +5,8 @@ pragma solidity 0.8.10; import './MACIFactory.sol'; import './ClrFund.sol'; import {CloneFactory} from './CloneFactory.sol'; -import {SignUpGatekeeper} from "maci-contracts/contracts/gatekeepers/SignUpGatekeeper.sol"; -import {InitialVoiceCreditProxy} from "maci-contracts/contracts/initialVoiceCreditProxy/InitialVoiceCreditProxy.sol"; +import {SignUpGatekeeper} from "@clrfund/maci-contracts/contracts/gatekeepers/SignUpGatekeeper.sol"; +import {InitialVoiceCreditProxy} from "@clrfund/maci-contracts/contracts/initialVoiceCreditProxy/InitialVoiceCreditProxy.sol"; contract ClrFundParams { struct Templates { diff --git a/contracts/contracts/FundingRound.sol b/contracts/contracts/FundingRound.sol index c55f9867a..33a6c9527 100644 --- a/contracts/contracts/FundingRound.sol +++ b/contracts/contracts/FundingRound.sol @@ -6,12 +6,12 @@ import '@openzeppelin/contracts/access/Ownable.sol'; import '@openzeppelin/contracts/token/ERC20/ERC20.sol'; import '@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol'; -import {DomainObjs} from 'maci-contracts/contracts/DomainObjs.sol'; -import {MACI} from 'maci-contracts/contracts/MACI.sol'; -import {Poll} from 'maci-contracts/contracts/Poll.sol'; -import {Tally} from 'maci-contracts/contracts/Tally.sol'; -import {SignUpGatekeeper} from "maci-contracts/contracts/gatekeepers/SignUpGatekeeper.sol"; -import {InitialVoiceCreditProxy} from "maci-contracts/contracts/initialVoiceCreditProxy/InitialVoiceCreditProxy.sol"; +import {DomainObjs} from '@clrfund/maci-contracts/contracts/DomainObjs.sol'; +import {MACI} from '@clrfund/maci-contracts/contracts/MACI.sol'; +import {Poll} from '@clrfund/maci-contracts/contracts/Poll.sol'; +import {Tally} from '@clrfund/maci-contracts/contracts/Tally.sol'; +import {SignUpGatekeeper} from "@clrfund/maci-contracts/contracts/gatekeepers/SignUpGatekeeper.sol"; +import {InitialVoiceCreditProxy} from "@clrfund/maci-contracts/contracts/initialVoiceCreditProxy/InitialVoiceCreditProxy.sol"; import './userRegistry/IUserRegistry.sol'; import './recipientRegistry/IRecipientRegistry.sol'; diff --git a/contracts/contracts/MACIFactory.sol b/contracts/contracts/MACIFactory.sol index a6b2d7381..8ffc30c5d 100644 --- a/contracts/contracts/MACIFactory.sol +++ b/contracts/contracts/MACIFactory.sol @@ -2,17 +2,17 @@ pragma solidity ^0.8.10; -import {MACI} from 'maci-contracts/contracts/MACI.sol'; -import {Poll, PollFactory} from 'maci-contracts/contracts/Poll.sol'; -import {SignUpGatekeeper} from 'maci-contracts/contracts/gatekeepers/SignUpGatekeeper.sol'; -import {InitialVoiceCreditProxy} from 'maci-contracts/contracts/initialVoiceCreditProxy/InitialVoiceCreditProxy.sol'; -import {TopupCredit} from 'maci-contracts/contracts/TopupCredit.sol'; -import {VkRegistry} from 'maci-contracts/contracts/VkRegistry.sol'; -import {SnarkCommon} from 'maci-contracts/contracts/crypto/SnarkCommon.sol'; +import {MACI} from '@clrfund/maci-contracts/contracts/MACI.sol'; +import {Poll, PollFactory} from '@clrfund/maci-contracts/contracts/Poll.sol'; +import {SignUpGatekeeper} from '@clrfund/maci-contracts/contracts/gatekeepers/SignUpGatekeeper.sol'; +import {InitialVoiceCreditProxy} from '@clrfund/maci-contracts/contracts/initialVoiceCreditProxy/InitialVoiceCreditProxy.sol'; +import {TopupCredit} from '@clrfund/maci-contracts/contracts/TopupCredit.sol'; +import {VkRegistry} from '@clrfund/maci-contracts/contracts/VkRegistry.sol'; +import {SnarkCommon} from '@clrfund/maci-contracts/contracts/crypto/SnarkCommon.sol'; import {Ownable} from '@openzeppelin/contracts/access/Ownable.sol'; -import {Params} from 'maci-contracts/contracts/Params.sol'; +import {Params} from '@clrfund/maci-contracts/contracts/Params.sol'; import {PollFactoryCreator} from './PollFactoryCreator.sol'; -import {IPubKey} from 'maci-contracts/contracts/DomainObjs.sol'; +import {IPubKey} from '@clrfund/maci-contracts/contracts/DomainObjs.sol'; contract MACIFactory is Ownable, Params, SnarkCommon, IPubKey { // Constants diff --git a/contracts/contracts/PollFactoryCreator.sol b/contracts/contracts/PollFactoryCreator.sol index 91923e304..24b8b0f9d 100644 --- a/contracts/contracts/PollFactoryCreator.sol +++ b/contracts/contracts/PollFactoryCreator.sol @@ -2,7 +2,7 @@ pragma solidity 0.8.10; -import {PollFactory} from 'maci-contracts/contracts/Poll.sol'; +import {PollFactory} from '@clrfund/maci-contracts/contracts/Poll.sol'; library PollFactoryCreator { function create() external returns (PollFactory pollFactory) { diff --git a/contracts/contracts/VkRegistryCreator.sol b/contracts/contracts/VkRegistryCreator.sol index 1e74242c8..ef43411c9 100644 --- a/contracts/contracts/VkRegistryCreator.sol +++ b/contracts/contracts/VkRegistryCreator.sol @@ -2,7 +2,7 @@ pragma solidity 0.8.10; -import {VkRegistry} from 'maci-contracts/contracts/VkRegistry.sol'; +import {VkRegistry} from '@clrfund/maci-contracts/contracts/VkRegistry.sol'; library VkRegistryCreator { function create() public returns (VkRegistry vkRegistry) { diff --git a/contracts/hardhat.config.ts b/contracts/hardhat.config.ts index 298841ef8..4aeff2110 100644 --- a/contracts/hardhat.config.ts +++ b/contracts/hardhat.config.ts @@ -181,7 +181,7 @@ task( const artifact = JSON.parse( fs .readFileSync( - `./node_modules/maci-contracts/artifacts/contracts/crypto/Hasher.sol/${contractName}.json` + `./node_modules/@clrfund/maci-contracts/artifacts/contracts/crypto/Hasher.sol/${contractName}.json` ) .toString() ) diff --git a/contracts/maci.d.ts b/contracts/maci.d.ts index ec588dadf..730c26386 100644 --- a/contracts/maci.d.ts +++ b/contracts/maci.d.ts @@ -1 +1 @@ -declare module 'maci-contracts' +declare module '@clrfund/maci-contracts' diff --git a/contracts/package.json b/contracts/package.json index 870856748..a30a7a920 100644 --- a/contracts/package.json +++ b/contracts/package.json @@ -22,14 +22,14 @@ "clean": "rm -rf cache && rm -rf build" }, "dependencies": { + "@clrfund/maci-contracts": "^1.1.7", "@openzeppelin/contracts": "4.9.0", "dotenv": "^8.2.0", - "maci-contracts": "npm:@clrfund/maci-contracts@^1.1.7", "solidity-rlp": "2.0.8" }, "devDependencies": { - "@clrfund/maci-circuits": "^1.1.7", "@clrfund/common": "^0.0.1", + "@clrfund/maci-circuits": "^1.1.7", "@clrfund/maci-cli": "^1.1.7", "@ethereum-waffle/mock-contract": "^3.4.4", "@kleros/gtcr-encoder": "^1.4.0", diff --git a/contracts/scripts/get-bytecode.ts b/contracts/scripts/get-bytecode.ts index 0e45b9adc..b800378a5 100644 --- a/contracts/scripts/get-bytecode.ts +++ b/contracts/scripts/get-bytecode.ts @@ -10,8 +10,8 @@ async function main() { let result: string if (poseidonT3Address && poseidonT6Address) { result = linkBytecode(artifact.deployedBytecode, { - 'maci-contracts/sol/Poseidon.sol:PoseidonT3': poseidonT3Address, - 'maci-contracts/sol/Poseidon.sol:PoseidonT6': poseidonT6Address, + '@clrfund/maci-contracts/sol/Poseidon.sol:PoseidonT3': poseidonT3Address, + '@clrfund/maci-contracts/sol/Poseidon.sol:PoseidonT6': poseidonT6Address, }) } else { result = artifact.deployedBytecode diff --git a/contracts/utils/deployment.ts b/contracts/utils/deployment.ts index d4a75e27a..d622c3cf3 100644 --- a/contracts/utils/deployment.ts +++ b/contracts/utils/deployment.ts @@ -75,7 +75,7 @@ type PoseidonName = 'PoseidonT3' | 'PoseidonT4' | 'PoseidonT5' | 'PoseidonT6' * read the artifact content and pass to the getContractFactory function * * NOTE: there are 2 copies of the Poseidon artifacts, the one in the build/contracts - * folder has the actual contract bytecode, the other one in the build/contracts/maci-contracts + * folder has the actual contract bytecode, the other one in the build/contracts/@clrfund/maci-contracts * only has the library interface. If the wrong bytecode is used to deploy the contract, * the hash functions will always return 0. * diff --git a/vue-app/src/api/abi.ts b/vue-app/src/api/abi.ts index 2006704a6..a31e2c0ab 100644 --- a/vue-app/src/api/abi.ts +++ b/vue-app/src/api/abi.ts @@ -2,7 +2,7 @@ import { abi as ERC20 } from '../../../contracts/build/contracts/@openzeppelin/c import { abi as FundingRoundFactory } from '../../../contracts/build/contracts/contracts/ClrFund.sol/ClrFund.json' import { abi as FundingRound } from '../../../contracts/build/contracts/contracts/FundingRound.sol/FundingRound.json' import { abi as MACIFactory } from '../../../contracts/build/contracts/contracts/MACIFactory.sol/MACIFactory.json' -import { abi as MACI } from '../../../contracts/build/contracts/maci-contracts/contracts/MACI.sol/MACI.json' +import { abi as MACI } from '../../../contracts/build/contracts/@clrfund/maci-contracts/contracts/MACI.sol/MACI.json' import { abi as UserRegistry } from '../../../contracts/build/contracts/contracts/userRegistry/IUserRegistry.sol/IUserRegistry.json' import { abi as BrightIdUserRegistry } from '../../../contracts/build/contracts/contracts/userRegistry/BrightIdUserRegistry.sol/BrightIdUserRegistry.json' import { abi as SnapshotUserRegistry } from '../../../contracts/build/contracts/contracts/userRegistry/SnapshotUserRegistry.sol/SnapshotUserRegistry.json' diff --git a/yarn.lock b/yarn.lock index 44fb31713..d825f089b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -660,7 +660,7 @@ xmlhttprequest "1.8.0" zkey-manager "^0.1.1" -"@clrfund/maci-contracts@^1.1.7", "maci-contracts@npm:@clrfund/maci-contracts@^1.1.7": +"@clrfund/maci-contracts@^1.1.7": version "1.1.7" resolved "https://registry.yarnpkg.com/@clrfund/maci-contracts/-/maci-contracts-1.1.7.tgz#8a35678cf76607c480ff164a70154c7bdc8b8c3c" integrity sha512-m68HH6KEP64WBWhJmUdiwk3kKSLfC+sIpE+vp4awBkCstFaEEgGQNEdikxKo2rFFSGpn7XPegb6oCeDXQvWxgg== @@ -2146,9 +2146,9 @@ integrity sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ== "@grpc/grpc-js@^1.7.1", "@grpc/grpc-js@^1.7.3": - version "1.9.10" - resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.9.10.tgz#d4eb0086662a3d05948312124a0212e71fc0cf0a" - integrity sha512-6W1NMW40R0fs4Tlv+Tx2+4J23IA/kV+ifnNaOcDAqDOBfbk3BTPuFmHVOxVQX0DEK9oD6KzKPyu2OiHW87tFpA== + version "1.9.11" + resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.9.11.tgz#7b21195c910a49c0bb5d0df21d28a30c4e174851" + integrity sha512-QDhMfbTROOXUhLHMroow8f3EHiCKUOh6UwxMP5S3EuXMnWMNSVIhatGZRwkpg9OUTYdZPsDUVH3cOAkWhGFUJw== dependencies: "@grpc/proto-loader" "^0.7.8" "@types/node" ">=12.12.47" @@ -2242,20 +2242,20 @@ source-map "0.6.1" yaml-eslint-parser "^0.3.2" -"@intlify/core-base@9.6.5": - version "9.6.5" - resolved "https://registry.yarnpkg.com/@intlify/core-base/-/core-base-9.6.5.tgz#af92cae122fb99e882b3d7f1433f682065a3e164" - integrity sha512-LzbGXiZkMWPIHnHI0g6q554S87Cmh2mmCmjytK/3pDQfjI84l+dgGoeQuKj02q7EbULRuUUgYVZVqAwEUawXGg== +"@intlify/core-base@9.7.0": + version "9.7.0" + resolved "https://registry.yarnpkg.com/@intlify/core-base/-/core-base-9.7.0.tgz#329f4225365187d9fbe7a3b5c5d8e897fa703b30" + integrity sha512-1tBnfnCI23jXqGW15cagCjn2GgD487VST1dMG8P5LRzrSfx+kUzqFyTrjMNIwgq1tVaF4HnDpFMUuyrzTLKphw== dependencies: - "@intlify/message-compiler" "9.6.5" - "@intlify/shared" "9.6.5" + "@intlify/message-compiler" "9.7.0" + "@intlify/shared" "9.7.0" -"@intlify/message-compiler@9.6.5": - version "9.6.5" - resolved "https://registry.yarnpkg.com/@intlify/message-compiler/-/message-compiler-9.6.5.tgz#3a33882497417c63b23b012731d60a485c8e5558" - integrity sha512-WeJ499thIj0p7JaIO1V3JaJbqdqfBykS5R8fElFs5hNeotHtPAMBs4IiA+8/KGFkAbjJusgFefCq6ajP7F7+4Q== +"@intlify/message-compiler@9.7.0": + version "9.7.0" + resolved "https://registry.yarnpkg.com/@intlify/message-compiler/-/message-compiler-9.7.0.tgz#6371127c5a2a4f50ec59728f85a7786e3478c931" + integrity sha512-/YdZCio2L2tCM5bZ2eMHbSEIQNPh1QqvZIOLI/yCVKXLscis7O0SsR2nmuU/DfCJ3iSeI8juw82C2wLvfsAeww== dependencies: - "@intlify/shared" "9.6.5" + "@intlify/shared" "9.7.0" source-map-js "^1.0.2" "@intlify/message-compiler@next": @@ -2271,10 +2271,10 @@ resolved "https://registry.yarnpkg.com/@intlify/shared/-/shared-9.4.1.tgz#bd0d221aaac476b6778a10ddcd0472f812c64e27" integrity sha512-A51elBmZWf1FS80inf/32diO9DeXoqg9GR9aUDHFcfHoNDuT46Q+fpPOdj8jiJnSHSBh8E1E+6qWRhAZXdK3Ng== -"@intlify/shared@9.6.5": - version "9.6.5" - resolved "https://registry.yarnpkg.com/@intlify/shared/-/shared-9.6.5.tgz#a81f384d804e99ceac55bb061c344f156bd96590" - integrity sha512-gD7Ey47Xi4h/t6P+S04ymMSoA3wVRxGqjxuIMglwRO8POki9h164Epu2N8wk/GHXM/hR6ZGcsx2HArCCENjqSQ== +"@intlify/shared@9.7.0": + version "9.7.0" + resolved "https://registry.yarnpkg.com/@intlify/shared/-/shared-9.7.0.tgz#96166a54b781997db92259772e9621d3f7dff9a5" + integrity sha512-PUkEuk//YKu4CHS5ah3mNa3XL/+TZj6rAY/6yYN+GCNFd2u+uWUkeuwE4Q6t8dydRWlErOePHHS0KyNoof/oBw== "@intlify/unplugin-vue-i18n@^0.8.1": version "0.8.2" @@ -4624,9 +4624,9 @@ form-data "^4.0.0" "@types/node@*", "@types/node@>=12.12.47", "@types/node@>=13.7.0": - version "20.9.0" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.9.0.tgz#bfcdc230583aeb891cf51e73cfdaacdd8deae298" - integrity sha512-nekiGu2NDb1BcVofVcEKMIwzlx4NjHlcjhoxxKBNLtz15Y1z7MYf549DFvkHSId02Ax6kGwWntIBPC3l/JZcmw== + version "20.9.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.9.1.tgz#9d578c610ce1e984adda087f685ace940954fe19" + integrity sha512-HhmzZh5LSJNS5O8jQKpJ/3ZcrrlG6L70hpGqMIAoM9YVD0YBRNWYsfwcXq8VnSjlNpCpgLzMXdiPo+dxcvSmiA== dependencies: undici-types "~5.26.4" @@ -5134,24 +5134,24 @@ dependencies: vue-demi "*" -"@walletconnect/core@2.10.4": - version "2.10.4" - resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-2.10.4.tgz#da9396b56f63806c165389cbf98d2373d36854df" - integrity sha512-MGdw5a4dIlQFPxVHEw2neIpHPAw3gtrsJYyUqm6rI+1c1SfmZyOPCaYTr6zPU2cnoWQUjv2ePMLeO/JKy3Yh5g== +"@walletconnect/core@2.10.5": + version "2.10.5" + resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-2.10.5.tgz#d61706c6459d9baaef05e83907df8cab82a03251" + integrity sha512-QnGHkA05KzJrtqExPqXm/TsstM1uTDI8tQT0x86/DuR6LdiYEntzSpVjnv7kKK6Mo9UxlXfud431dNRfOW5uJg== dependencies: "@walletconnect/heartbeat" "1.2.1" "@walletconnect/jsonrpc-provider" "1.0.13" "@walletconnect/jsonrpc-types" "1.0.3" "@walletconnect/jsonrpc-utils" "1.0.8" - "@walletconnect/jsonrpc-ws-connection" "1.0.13" - "@walletconnect/keyvaluestorage" "^1.0.2" + "@walletconnect/jsonrpc-ws-connection" "1.0.14" + "@walletconnect/keyvaluestorage" "^1.1.1" "@walletconnect/logger" "^2.0.1" "@walletconnect/relay-api" "^1.0.9" "@walletconnect/relay-auth" "^1.0.4" "@walletconnect/safe-json" "^1.0.2" "@walletconnect/time" "^1.0.2" - "@walletconnect/types" "2.10.4" - "@walletconnect/utils" "2.10.4" + "@walletconnect/types" "2.10.5" + "@walletconnect/utils" "2.10.5" events "^3.3.0" lodash.isequal "4.5.0" uint8arrays "^3.1.0" @@ -5164,18 +5164,19 @@ tslib "1.14.1" "@walletconnect/ethereum-provider@^2.9.0": - version "2.10.4" - resolved "https://registry.yarnpkg.com/@walletconnect/ethereum-provider/-/ethereum-provider-2.10.4.tgz#6123c4418ab8ff2a787ea6b70d40493dace992d6" - integrity sha512-t8Utp3GOk4p1X//tRgLDdTh/+nmb5SwvmrMpfHzcDvYjetqtTWfZcXt2xj7DOsnvwaxi8MPf+0FqlTiZnrnNWQ== + version "2.10.5" + resolved "https://registry.yarnpkg.com/@walletconnect/ethereum-provider/-/ethereum-provider-2.10.5.tgz#a14ede16a751f115f8a0d050736155c8654835d5" + integrity sha512-Pihi2M03cRkWEiGetRUiO2A506YTj/Bbbxp+Ct7t5N5SccoeuhrzsEt30pA7I0XAiOnAeKp79OKmXHRhXfRmhg== dependencies: "@walletconnect/jsonrpc-http-connection" "^1.0.7" "@walletconnect/jsonrpc-provider" "^1.0.13" "@walletconnect/jsonrpc-types" "^1.0.3" "@walletconnect/jsonrpc-utils" "^1.0.8" - "@walletconnect/sign-client" "2.10.4" - "@walletconnect/types" "2.10.4" - "@walletconnect/universal-provider" "2.10.4" - "@walletconnect/utils" "2.10.4" + "@walletconnect/modal" "^2.4.3" + "@walletconnect/sign-client" "2.10.5" + "@walletconnect/types" "2.10.5" + "@walletconnect/universal-provider" "2.10.5" + "@walletconnect/utils" "2.10.5" events "^3.3.0" "@walletconnect/events@^1.0.1": @@ -5231,21 +5232,20 @@ "@walletconnect/jsonrpc-types" "^1.0.3" tslib "1.14.1" -"@walletconnect/jsonrpc-ws-connection@1.0.13": - version "1.0.13" - resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-ws-connection/-/jsonrpc-ws-connection-1.0.13.tgz#23b0cdd899801bfbb44a6556936ec2b93ef2adf4" - integrity sha512-mfOM7uFH4lGtQxG+XklYuFBj6dwVvseTt5/ahOkkmpcAEgz2umuzu7fTR+h5EmjQBdrmYyEBOWADbeaFNxdySg== +"@walletconnect/jsonrpc-ws-connection@1.0.14": + version "1.0.14" + resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-ws-connection/-/jsonrpc-ws-connection-1.0.14.tgz#eec700e74766c7887de2bd76c91a0206628732aa" + integrity sha512-Jsl6fC55AYcbkNVkwNM6Jo+ufsuCQRqViOQ8ZBPH9pRREHH9welbBiszuTLqEJiQcO/6XfFDl6bzCJIkrEi8XA== dependencies: "@walletconnect/jsonrpc-utils" "^1.0.6" "@walletconnect/safe-json" "^1.0.2" events "^3.3.0" - tslib "1.14.1" ws "^7.5.1" -"@walletconnect/keyvaluestorage@^1.0.2": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@walletconnect/keyvaluestorage/-/keyvaluestorage-1.1.0.tgz#782ad09af71e5241147fd7479f8814bd8ab8bb38" - integrity sha512-CjDBs1WmLGstYRoxWx9oAskTKj1deu7gvPycxZo2jYMa85hAYe762AITKWW1i2OJ8y9+5WJTGDAy3inVl8pjtw== +"@walletconnect/keyvaluestorage@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@walletconnect/keyvaluestorage/-/keyvaluestorage-1.1.1.tgz#dd2caddabfbaf80f6b8993a0704d8b83115a1842" + integrity sha512-V7ZQq2+mSxAq7MrRqDxanTzu2RcElfK1PfNYiaVnJgJ7Q7G7hTVwF8voIBx92qsRyGHZihrwNPHuZd1aKkd0rA== dependencies: "@walletconnect/safe-json" "^1.0.1" idb-keyval "^6.2.1" @@ -5276,7 +5276,7 @@ motion "10.16.2" qrcode "1.5.3" -"@walletconnect/modal@^2.6.0": +"@walletconnect/modal@^2.4.3", "@walletconnect/modal@^2.6.0": version "2.6.2" resolved "https://registry.yarnpkg.com/@walletconnect/modal/-/modal-2.6.2.tgz#4b534a836f5039eeb3268b80be7217a94dd12651" integrity sha512-eFopgKi8AjKf/0U4SemvcYw9zlLpx9njVN8sf6DAkowC2Md0gPU/UNEbH1Wwj407pEKnEds98pKWib1NN1ACoA== @@ -5311,19 +5311,19 @@ dependencies: tslib "1.14.1" -"@walletconnect/sign-client@2.10.4": - version "2.10.4" - resolved "https://registry.yarnpkg.com/@walletconnect/sign-client/-/sign-client-2.10.4.tgz#4e3b14ebe900472874f4cae5f53c74a6077c85da" - integrity sha512-C5VHkK59/DQNrJS91UXLn5OSr0drXHkKjajhl2a9hb3h6kxuSdlWbyC0yRPKT1sD0fQho8+EWZHBiV063yBePw== +"@walletconnect/sign-client@2.10.5": + version "2.10.5" + resolved "https://registry.yarnpkg.com/@walletconnect/sign-client/-/sign-client-2.10.5.tgz#f97f0fed544179a3303941f3bebd13ede3a736ed" + integrity sha512-HEYsoeGC6fGplQy0NIZSRNHgOwZwQ892UWG1Ahkcasf2R35QaBgnTVQkSCisl1PAAOKXZG7yB1YDoAAZBF+g5Q== dependencies: - "@walletconnect/core" "2.10.4" + "@walletconnect/core" "2.10.5" "@walletconnect/events" "^1.0.1" "@walletconnect/heartbeat" "1.2.1" "@walletconnect/jsonrpc-utils" "1.0.8" "@walletconnect/logger" "^2.0.1" "@walletconnect/time" "^1.0.2" - "@walletconnect/types" "2.10.4" - "@walletconnect/utils" "2.10.4" + "@walletconnect/types" "2.10.5" + "@walletconnect/utils" "2.10.5" events "^3.3.0" "@walletconnect/time@^1.0.2": @@ -5333,37 +5333,37 @@ dependencies: tslib "1.14.1" -"@walletconnect/types@2.10.4": - version "2.10.4" - resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-2.10.4.tgz#23f6e4bd785671812dc6ea96848a6bd7ea78f038" - integrity sha512-eQpOElyiwJp3tepuOS3TS9dXTl9jVVlrC3iVA8bytnbLagkAUxmiv/s7PyDFx+ndXwQVh8PFBkWg1oxGwgCSBA== +"@walletconnect/types@2.10.5": + version "2.10.5" + resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-2.10.5.tgz#bf4e692cf736b6e71423f96a106d7a96089245de" + integrity sha512-N8xaN7/Kob93rKxKDaT6oy6symgIkAwyLqq0/dLJEhXfv7S/gyNvDka4SosjVVTc4oTvE1+OmxNIR8pB1DuwJw== dependencies: "@walletconnect/events" "^1.0.1" "@walletconnect/heartbeat" "1.2.1" "@walletconnect/jsonrpc-types" "1.0.3" - "@walletconnect/keyvaluestorage" "^1.0.2" + "@walletconnect/keyvaluestorage" "^1.1.1" "@walletconnect/logger" "^2.0.1" events "^3.3.0" -"@walletconnect/universal-provider@2.10.4": - version "2.10.4" - resolved "https://registry.yarnpkg.com/@walletconnect/universal-provider/-/universal-provider-2.10.4.tgz#601604d11320531594dab928ef2af88b19dda74c" - integrity sha512-f9uhRQX9iExoMz1V4JT13OpqvpoJYhE9GLvuwNWposhDS35vVKfQfmPxQCcsdw7IpMr+UdpA8K2ShPh8g9wT4g== +"@walletconnect/universal-provider@2.10.5": + version "2.10.5" + resolved "https://registry.yarnpkg.com/@walletconnect/universal-provider/-/universal-provider-2.10.5.tgz#b08965a9306a30775796cc0cc384f2dfc9fde512" + integrity sha512-sQOvjrGF6za7+6zv7KI9eQz2gzRbS19j7U1z+JwIWdn4VBJmriaTjVHDz/R1liwKcS4sUiUthDC6WmQvjukjZQ== dependencies: "@walletconnect/jsonrpc-http-connection" "^1.0.7" "@walletconnect/jsonrpc-provider" "1.0.13" "@walletconnect/jsonrpc-types" "^1.0.2" "@walletconnect/jsonrpc-utils" "^1.0.7" "@walletconnect/logger" "^2.0.1" - "@walletconnect/sign-client" "2.10.4" - "@walletconnect/types" "2.10.4" - "@walletconnect/utils" "2.10.4" + "@walletconnect/sign-client" "2.10.5" + "@walletconnect/types" "2.10.5" + "@walletconnect/utils" "2.10.5" events "^3.3.0" -"@walletconnect/utils@2.10.4": - version "2.10.4" - resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-2.10.4.tgz#5f17938e7ea481541ec2dbae0df5cd494c72523f" - integrity sha512-XbrKgnQ0hC9DC9wjFb468MEYMoJxnCVmOj2gi01DA4FSr8fJi7wwNRUnlnZzLWrUWrHuaPReYe4PgBAgIv363g== +"@walletconnect/utils@2.10.5": + version "2.10.5" + resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-2.10.5.tgz#8c8ef90c9e2b59886aae002ab8cbbdb35da1df9a" + integrity sha512-3yeclD9/AlPEIHBqBVzrHUO/KRAEIXVK0ViIQ5oUH+zT3TpdsDGDiW1Z0TsAQ1EiYoiiz8dOQzd80a3eZVwnrg== dependencies: "@stablelib/chacha20poly1305" "1.0.1" "@stablelib/hkdf" "1.0.1" @@ -5373,7 +5373,7 @@ "@walletconnect/relay-api" "^1.0.9" "@walletconnect/safe-json" "^1.0.2" "@walletconnect/time" "^1.0.2" - "@walletconnect/types" "2.10.4" + "@walletconnect/types" "2.10.5" "@walletconnect/window-getters" "^1.0.1" "@walletconnect/window-metadata" "^1.0.1" detect-browser "5.3.0" @@ -5646,7 +5646,7 @@ acorn@^7.1.1, acorn@^7.4.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.1.0, acorn@^8.10.0, acorn@^8.4.1, acorn@^8.6.0, acorn@^8.8.1, acorn@^8.9.0: +acorn@^8.1.0, acorn@^8.10.0, acorn@^8.11.2, acorn@^8.4.1, acorn@^8.6.0, acorn@^8.8.1, acorn@^8.9.0: version "8.11.2" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.2.tgz#ca0d78b51895be5390a5903c5b3bdcdaf78ae40b" integrity sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w== @@ -7397,7 +7397,6 @@ buffer-from@^1.0.0: integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== "buffer-polyfill@npm:buffer@^6.0.3", buffer@^6.0.1, buffer@^6.0.3: - name buffer-polyfill version "6.0.3" resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6" integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA== @@ -8417,9 +8416,9 @@ common-tags@1.8.2: integrity sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA== component-emitter@^1.2.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" - integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== + version "1.3.1" + resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.1.tgz#ef1d5796f7d93f135ee6fb684340b26403c97d17" + integrity sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ== compress-commons@^5.0.1: version "5.0.1" @@ -9541,9 +9540,9 @@ electron-fetch@^1.7.2: encoding "^0.1.13" electron-to-chromium@^1.3.47, electron-to-chromium@^1.4.535: - version "1.4.583" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.583.tgz#7b0ac4f36388da4b5485788adb92cd7dd0abffc4" - integrity sha512-93y1gcONABZ7uqYe/JWDVQP/Pj/sQSunF0HVAPdlg/pfBnOyBMLlQUxWvkqcljJg1+W6cjvPuYD+r1Th9Tn8mA== + version "1.4.587" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.587.tgz#d8b864f21338b60798d447a3d83b90753f701d07" + integrity sha512-RyJX0q/zOkAoefZhB9XHghGeATVP0Q3mwA253XD/zj2OeXc+JZB9pCaEv6R578JUYaWM9PRhye0kXvd/V1cQ3Q== elegant-spinner@^1.0.1: version "1.0.1" @@ -12068,9 +12067,9 @@ globby@^13.0.0, globby@^13.1.1: merge2 "^1.4.1" slash "^4.0.0" -"gluegun@https://github.com/edgeandnode/gluegun#v4.3.1-pin-colors-dep": +"gluegun@git+https://github.com/edgeandnode/gluegun.git#v4.3.1-pin-colors-dep": version "4.3.1" - resolved "https://github.com/edgeandnode/gluegun#b34b9003d7bf556836da41b57ef36eb21570620a" + resolved "git+https://github.com/edgeandnode/gluegun.git#b34b9003d7bf556836da41b57ef36eb21570620a" dependencies: apisauce "^1.0.1" app-module-path "^2.2.0" @@ -12364,9 +12363,9 @@ hardhat-contract-sizer@^2.10.0, hardhat-contract-sizer@^2.6.1: strip-ansi "^6.0.0" hardhat@^2.12.5, hardhat@^2.12.6: - version "2.19.0" - resolved "https://registry.yarnpkg.com/hardhat/-/hardhat-2.19.0.tgz#1e08658863550ba351788ea128e544ff80584a31" - integrity sha512-kMpwovOEfrFRQXEopCP+JTcKVwSYVj8rnXE0LynxDqnh06yvyKCQknmXL6IVYTHQL6Csysc/yNbCHQbjSeJGpA== + version "2.19.1" + resolved "https://registry.yarnpkg.com/hardhat/-/hardhat-2.19.1.tgz#5e09e8070ecfc6109ba9d3a4a117ec2b0643032a" + integrity sha512-bsWa63g1GB78ZyMN08WLhFElLPA+J+pShuKD1BFO2+88g3l+BL3R07vj9deIi9dMbssxgE714Gof1dBEDGqnCw== dependencies: "@ethersproject/abi" "^5.1.2" "@metamask/eth-sig-util" "^4.0.0" @@ -12838,9 +12837,9 @@ ieee754@^1.1.13, ieee754@^1.2.1: integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== ignore@^5.2.0, ignore@^5.2.4: - version "5.2.4" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" - integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== + version "5.3.0" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.0.tgz#67418ae40d34d6999c95ff56016759c718c82f78" + integrity sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg== immediate@^3.2.3: version "3.3.0" @@ -17678,9 +17677,9 @@ pino@7.11.0: thread-stream "^0.15.1" pino@^8.5.0: - version "8.16.1" - resolved "https://registry.yarnpkg.com/pino/-/pino-8.16.1.tgz#dcaf82764b1a27f24101317cdd6453e96290f1d9" - integrity sha512-3bKsVhBmgPjGV9pyn4fO/8RtoVDR8ssW1ev819FsRXlRNgW8gR/9Kx+gCK4UPWd4JjrRDLWpzd/pb1AyWm3MGA== + version "8.16.2" + resolved "https://registry.yarnpkg.com/pino/-/pino-8.16.2.tgz#7a906f2d9a8c5b4c57412c9ca95d6820bd2090cd" + integrity sha512-2advCDGVEvkKu9TTVSa/kWW7Z3htI/sBKEZpqiHk6ive0i/7f5b1rsU8jn0aimxqfnSz5bj/nOYkwhBUn5xxvg== dependencies: atomic-sleep "^1.0.0" fast-redact "^3.1.1" @@ -19112,9 +19111,9 @@ scuid@^1.1.0: integrity sha512-MuCAyrGZcTLfQoH2XoBlQ8C6bzwN88XT/0slOGz0pn8+gIP85BOAfYa44ZXQUTOwRwPU0QvgU+V+OSajl/59Xg== scule@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/scule/-/scule-1.0.0.tgz#895e6f4ba887e78d8b9b4111e23ae84fef82376d" - integrity sha512-4AsO/FrViE/iDNEPaAQlb77tf0csuq27EsVpy6ett584EcRTp6pTDLoGWVxCD77y5iU5FauOvhsI4o1APwPoSQ== + version "1.1.0" + resolved "https://registry.yarnpkg.com/scule/-/scule-1.1.0.tgz#cbc109256b4aa59fc8074151284cb8cb103531eb" + integrity sha512-vRUjqhyM/YWYzT+jsMk6tnl3NkY4A4soJ8uyh3O6Um+JXEQL9ozUCe7pqrxn3CSKokw0hw3nFStfskzpgYwR0g== secp256k1@^4.0.1: version "4.0.3" @@ -21069,9 +21068,9 @@ uc.micro@^1.0.1, uc.micro@^1.0.5: integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA== ufo@^1.3.0, ufo@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.3.1.tgz#e085842f4627c41d4c1b60ebea1f75cdab4ce86b" - integrity sha512-uY/99gMLIOlJPwATcMVYfqDSxUR9//AUcgZMzwfSTJPDKzA1S8mX4VLqa+fiAtveraQUBCz4FFcwVZBGbwBXIw== + version "1.3.2" + resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.3.2.tgz#c7d719d0628a1c80c006d2240e0d169f6e3c0496" + integrity sha512-o+ORpgGwaYQXgqGDwd+hkS4PuZ3QnmqMMxRuajK/a38L6fTpcE5GPIfrf+L/KemFzfUpeUQc1rRS1iDBozvnFA== uid-safe@2.1.5: version "2.1.5" @@ -21266,14 +21265,14 @@ unplugin-vue-components@^0.22.11: unplugin "^1.0.1" unplugin@^1.0.0, unplugin@^1.0.1: - version "1.5.0" - resolved "https://registry.yarnpkg.com/unplugin/-/unplugin-1.5.0.tgz#8938ae84defe62afc7757df9ca05d27160f6c20c" - integrity sha512-9ZdRwbh/4gcm1JTOkp9lAkIDrtOyOxgHmY7cjuwI8L/2RTikMcVG25GsZwNAgRuap3iDw2jeq7eoqtAsz5rW3A== + version "1.5.1" + resolved "https://registry.yarnpkg.com/unplugin/-/unplugin-1.5.1.tgz#806688376fa3dcca4d2fa2c5d27cf6cd0370fbef" + integrity sha512-0QkvG13z6RD+1L1FoibQqnvTwVBXvS4XSPwAyinVgoOCl2jAgwzdUKmEj05o4Lt8xwQI85Hb6mSyYkcAGwZPew== dependencies: - acorn "^8.10.0" + acorn "^8.11.2" chokidar "^3.5.3" webpack-sources "^3.2.3" - webpack-virtual-modules "^0.5.0" + webpack-virtual-modules "^0.6.0" unset-value@^1.0.0: version "1.0.0" @@ -21284,9 +21283,9 @@ unset-value@^1.0.0: isobject "^3.0.0" unstorage@^1.9.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/unstorage/-/unstorage-1.10.0.tgz#6ac8e24d1d61c5373ae6a84b7059d6e89a868c64" - integrity sha512-azLoAeUMi1d1U823lR+eipFJjBydDAXFXoDAu6R9YCxQbkHzpoWaahqZUSkFFSfQSUZiWCqH3GmT3KuzffbcCQ== + version "1.10.1" + resolved "https://registry.yarnpkg.com/unstorage/-/unstorage-1.10.1.tgz#bf8cc00a406e40a6293e893da9807057d95875b0" + integrity sha512-rWQvLRfZNBpF+x8D3/gda5nUCQL2PgXy2jNG4U7/Rc9BGEv9+CAJd0YyGCROUBKs9v49Hg8huw3aih5Bf5TAVw== dependencies: anymatch "^3.1.3" chokidar "^3.5.3" @@ -21647,12 +21646,12 @@ vue-i18n-extract@^2.0.7: js-yaml "^4.1.0" vue-i18n@9: - version "9.6.5" - resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-9.6.5.tgz#3a0bdc1e339ded633dc90aee640a7249efdfe3e5" - integrity sha512-dpUEjKHg7pEsaS7ZPPxp1CflaR7bGmsvZJEhnszHPKl9OTNyno5j/DvMtMSo41kpddq4felLA7GK2prjpnXVlw== + version "9.7.0" + resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-9.7.0.tgz#c88592ade72c651d6879895244d348f2892c5646" + integrity sha512-8Z8kSz9U2juzuAf+6mjW1HTd5pIlYuFJZkC+HvYOglFdpzwc2rTUGjxKwN8xGdtGur1MFnyJ44TSr+TksJtY8A== dependencies: - "@intlify/core-base" "9.6.5" - "@intlify/shared" "9.6.5" + "@intlify/core-base" "9.7.0" + "@intlify/shared" "9.7.0" "@vue/devtools-api" "^6.5.0" vue-meta@3.0.0-alpha.8: @@ -22317,10 +22316,10 @@ webpack-sources@^3.2.3: resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== -webpack-virtual-modules@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/webpack-virtual-modules/-/webpack-virtual-modules-0.5.0.tgz#362f14738a56dae107937ab98ea7062e8bdd3b6c" - integrity sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw== +webpack-virtual-modules@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/webpack-virtual-modules/-/webpack-virtual-modules-0.6.0.tgz#95eb2cb160a8cb84a73bdc2b5c806693f690ad35" + integrity sha512-KnaMTE6EItz/f2q4Gwg5/rmeKVi79OR58NoYnwDJqCk9ywMtTGbBnBcfoBtN4QbYu0lWXvyMoH2Owxuhe4qI6Q== websocket@1.0.32: version "1.0.32"