diff --git a/packages/erc3k/test/erc3k-data.test.ts b/packages/erc3k/test/erc3k-data.test.ts index d83aedaab..8df82ae6e 100644 --- a/packages/erc3k/test/erc3k-data.test.ts +++ b/packages/erc3k/test/erc3k-data.test.ts @@ -32,7 +32,7 @@ describe('ERC3000Data', function () { beforeEach(async () => { const ERC3000DataLibTest = (await ethers.getContractFactory( 'ERC3000DataLibTest' - )) as ERC3000DataLibTest__factory + )) as unknown as ERC3000DataLibTest__factory erc3kDataLib = await ERC3000DataLibTest.deploy() chainId = (await ethers.provider.getNetwork()).chainId diff --git a/packages/erc3k/test/erc3k-exec.test.ts b/packages/erc3k/test/erc3k-exec.test.ts index b1d017317..904f8142f 100644 --- a/packages/erc3k/test/erc3k-exec.test.ts +++ b/packages/erc3k/test/erc3k-exec.test.ts @@ -7,7 +7,7 @@ describe('ERC3000 Executor', function () { beforeEach(async () => { const ERC3000Executor = (await ethers.getContractFactory( 'ERC3000ExecutorMock' - )) as ERC3000ExecutorMock__factory + )) as unknown as ERC3000ExecutorMock__factory erc3kExec = await ERC3000Executor.deploy() }) }) diff --git a/packages/erc3k/test/erc3k.test.ts b/packages/erc3k/test/erc3k.test.ts index c0a9a2dc5..55b4ce91d 100644 --- a/packages/erc3k/test/erc3k.test.ts +++ b/packages/erc3k/test/erc3k.test.ts @@ -7,7 +7,7 @@ describe('ERC3000', function () { beforeEach(async () => { const ERC3000 = (await ethers.getContractFactory( 'ERC3000Mock' - )) as ERC3000Mock__factory + )) as unknown as ERC3000Mock__factory erc3k = await ERC3000.deploy() }) }) diff --git a/packages/govern-console/src/utils/ipfs.tsx b/packages/govern-console/src/utils/ipfs.tsx index d811e224e..91c7e13a2 100644 --- a/packages/govern-console/src/utils/ipfs.tsx +++ b/packages/govern-console/src/utils/ipfs.tsx @@ -16,9 +16,9 @@ const MIME_TYPES = ['text/plain']; function createIpfs() { if (!ipfs) { ipfs = create({ - url: 'https://ipfs-0.aragon.network/api/v0', + url: 'https://prod.ipfs.aragon.network', headers: { - 'X-API-KEY': 'yRERPRwFAb5ZiV94XvJdgvDKoGEeFerfFsAQ65', + 'X-API-KEY': 'b477RhECf8s8sdM7XrkLBs2wHc4kCMwpbcFC55Kt', }, }); } diff --git a/packages/govern-contract-utils/test/acl.test.ts b/packages/govern-contract-utils/test/acl.test.ts index 151039fb3..cd4820638 100644 --- a/packages/govern-contract-utils/test/acl.test.ts +++ b/packages/govern-contract-utils/test/acl.test.ts @@ -34,7 +34,7 @@ describe('ACL', function () { }) beforeEach(async () => { - const ACL = (await ethers.getContractFactory('ACL')) as ACL__factory + const ACL = (await ethers.getContractFactory('ACL')) as unknown as ACL__factory acl = await ACL.deploy(root) aclNotRoot = await acl.connect(signers[1]) }) diff --git a/packages/govern-contract-utils/test/adaptive-erc165.test.ts b/packages/govern-contract-utils/test/adaptive-erc165.test.ts index 1a5944f6f..bba7c2939 100644 --- a/packages/govern-contract-utils/test/adaptive-erc165.test.ts +++ b/packages/govern-contract-utils/test/adaptive-erc165.test.ts @@ -32,10 +32,10 @@ describe('AdaptiveErc165', function () { signers = await ethers.getSigners() const Adaptive = (await ethers.getContractFactory( 'AdaptiveERC165Mock' - )) as AdaptiveERC165Mock__factory + )) as unknown as AdaptiveERC165Mock__factory const AdaptiveHelper = (await ethers.getContractFactory( 'AdaptiveERC165MockHelper' - )) as AdaptiveERC165MockHelper__factory + )) as unknown as AdaptiveERC165MockHelper__factory adaptive = await Adaptive.deploy() adaptiveHelper = await AdaptiveHelper.deploy(adaptive.address) diff --git a/packages/govern-contract-utils/test/address-utils.test.ts b/packages/govern-contract-utils/test/address-utils.test.ts index deb17d9e6..b0e9c969d 100644 --- a/packages/govern-contract-utils/test/address-utils.test.ts +++ b/packages/govern-contract-utils/test/address-utils.test.ts @@ -9,7 +9,7 @@ describe('AddressUtils', function () { beforeEach(async () => { const AddressUtilsMock = (await ethers.getContractFactory( 'AddressUtilsMock' - )) as AddressUtilsMock__factory + )) as unknown as AddressUtilsMock__factory addressUtils = await AddressUtilsMock.deploy() owner = await (await ethers.getSigners())[0].getAddress() }) diff --git a/packages/govern-contract-utils/test/bitmaplib.test.ts b/packages/govern-contract-utils/test/bitmaplib.test.ts index 397ce2bce..65b1a92c3 100644 --- a/packages/govern-contract-utils/test/bitmaplib.test.ts +++ b/packages/govern-contract-utils/test/bitmaplib.test.ts @@ -8,7 +8,7 @@ describe('Bitmap', function () { beforeEach(async () => { const BitmapLib = (await ethers.getContractFactory( 'BitmapLibMock' - )) as BitmapLibMock__factory + )) as unknown as BitmapLibMock__factory lib = await BitmapLib.deploy() }) diff --git a/packages/govern-contract-utils/test/deposit-lib.test.ts b/packages/govern-contract-utils/test/deposit-lib.test.ts index 29dafab21..d2d396365 100644 --- a/packages/govern-contract-utils/test/deposit-lib.test.ts +++ b/packages/govern-contract-utils/test/deposit-lib.test.ts @@ -27,7 +27,7 @@ describe('DepositLib', function () { before(async () => { const DepositLibMockFactory = (await ethers.getContractFactory( 'DepositLibMock' - )) as DepositLibMock__factory + )) as unknown as DepositLibMock__factory depositLibMock = await DepositLibMockFactory.deploy() owner = await (await ethers.getSigners())[0].getAddress() @@ -37,7 +37,7 @@ describe('DepositLib', function () { before(async () => { const GoodTokenFactory = (await ethers.getContractFactory( 'GoodToken' - )) as GoodToken__factory + )) as unknown as GoodToken__factory goodToken = await GoodTokenFactory.deploy() }) @@ -84,7 +84,7 @@ describe('DepositLib', function () { before(async () => { const GoodTokenFactory = (await ethers.getContractFactory( 'GoodToken' - )) as GoodToken__factory + )) as unknown as GoodToken__factory goodToken = await GoodTokenFactory.deploy() }) diff --git a/packages/govern-contract-utils/test/erc1167-proxy-factory.test.ts b/packages/govern-contract-utils/test/erc1167-proxy-factory.test.ts index bbbbfa2a0..5af8bc666 100644 --- a/packages/govern-contract-utils/test/erc1167-proxy-factory.test.ts +++ b/packages/govern-contract-utils/test/erc1167-proxy-factory.test.ts @@ -21,7 +21,7 @@ describe('ERC1167ProxyFactory', () => { owner = await signers[0].getAddress() const CloneFactoryMock = (await ethers.getContractFactory( 'CloneFactoryMock' - )) as CloneFactoryMock__factory + )) as unknown as CloneFactoryMock__factory factory = await CloneFactoryMock.deploy() }) @@ -34,7 +34,7 @@ describe('ERC1167ProxyFactory', () => { 'ClonedContract', clonedContractAddress, signers[0] - )) as ClonedContract + )) as unknown as ClonedContract expect(await clonedContract.getRandomString()).to.be.equal('NO INIT') }) @@ -47,7 +47,7 @@ describe('ERC1167ProxyFactory', () => { 'ClonedContractWithInit', clonedContractAddress, signers[0] - )) as ClonedContractWithInit + )) as unknown as ClonedContractWithInit expect(await clonedContract.randomString()).to.be.equal('INIT DATA') }) @@ -62,7 +62,7 @@ describe('ERC1167ProxyFactory', () => { 'ClonedContract', clonedContractAddress, signers[0] - )) as ClonedContract + )) as unknown as ClonedContract expect(await clonedContract.getRandomString()).to.be.equal('NO INIT') }) @@ -75,7 +75,7 @@ describe('ERC1167ProxyFactory', () => { 'ClonedContractWithInit', clonedContractAddress, signers[0] - )) as ClonedContractWithInit + )) as unknown as ClonedContractWithInit expect(await clonedContract.randomString()).to.be.equal('INIT DATA') }) diff --git a/packages/govern-contract-utils/test/initializable.test.ts b/packages/govern-contract-utils/test/initializable.test.ts index 0582f0884..70c6cd70c 100644 --- a/packages/govern-contract-utils/test/initializable.test.ts +++ b/packages/govern-contract-utils/test/initializable.test.ts @@ -10,7 +10,7 @@ describe('Initializable', function () { beforeEach(async () => { const Initializable = (await ethers.getContractFactory( 'InitializableMock' - )) as InitializableMock__factory + )) as unknown as InitializableMock__factory init = await Initializable.deploy() }) diff --git a/packages/govern-contract-utils/test/safe-erc20.test.ts b/packages/govern-contract-utils/test/safe-erc20.test.ts index 657594717..8d928d86f 100644 --- a/packages/govern-contract-utils/test/safe-erc20.test.ts +++ b/packages/govern-contract-utils/test/safe-erc20.test.ts @@ -35,24 +35,24 @@ describe('SafeERC20', function () { beforeEach(async () => { const safeERCMock = (await ethers.getContractFactory( 'SafeERC20Mock' - )) as SafeERC20Mock__factory + )) as unknown as SafeERC20Mock__factory safeERC20 = await safeERCMock.deploy() const BadToken = (await ethers.getContractFactory( 'BadToken' - )) as BadToken__factory + )) as unknown as BadToken__factory badToken = await BadToken.deploy() badToken.setBalanceTo(safeERC20.address, balanceAmount) const GoodToken = (await ethers.getContractFactory( 'GoodToken' - )) as GoodToken__factory + )) as unknown as GoodToken__factory goodToken = await GoodToken.deploy() goodToken.setBalanceTo(safeERC20.address, balanceAmount) const WorstToken = (await ethers.getContractFactory( 'WorstToken' - )) as WorstToken__factory + )) as unknown as WorstToken__factory worstToken = await WorstToken.deploy() worstToken.setBalanceTo(safeERC20.address, balanceAmount) diff --git a/packages/govern-core/test/govern-registry.test.ts b/packages/govern-core/test/govern-registry.test.ts index 51e604af4..d1422cbe8 100644 --- a/packages/govern-core/test/govern-registry.test.ts +++ b/packages/govern-core/test/govern-registry.test.ts @@ -36,15 +36,15 @@ describe('GovernRegistry', function () { beforeEach(async () => { const ERC3000Mock = (await ethers.getContractFactory( 'ERC3000Mock' - )) as ERC3000Mock__factory + )) as unknown as ERC3000Mock__factory const ERC3000ExecutorMock = (await ethers.getContractFactory( 'ERC3000ExecutorMock' - )) as ERC3000ExecutorMock__factory + )) as unknown as ERC3000ExecutorMock__factory const GovernRegistry = (await ethers.getContractFactory( 'GovernRegistry' - )) as GovernRegistry__factory + )) as unknown as GovernRegistry__factory erc3kExec = await ERC3000ExecutorMock.deploy() diff --git a/packages/govern-core/test/govern.test.ts b/packages/govern-core/test/govern.test.ts index 2c9c1961e..9e462713b 100644 --- a/packages/govern-core/test/govern.test.ts +++ b/packages/govern-core/test/govern.test.ts @@ -28,7 +28,7 @@ describe('Govern', function () { beforeEach(async () => { const Govern = await ethers.getContractFactory('Govern') - govern = (await Govern.deploy(owner)) as Govern + govern = (await Govern.deploy(owner)) as unknown as Govern governNotOwner = await govern.connect(signers[1]) }) diff --git a/packages/govern-core/test/pipelines/govern-queue.test.ts b/packages/govern-core/test/pipelines/govern-queue.test.ts index 6aab19b53..e249418ed 100644 --- a/packages/govern-core/test/pipelines/govern-queue.test.ts +++ b/packages/govern-core/test/pipelines/govern-queue.test.ts @@ -102,7 +102,7 @@ describe('Govern Queue', function () { const createArbitratorMock = async () => { const ArbitratorMock = (await ethers.getContractFactory( 'ArbitratorMock' - )) as ArbitratorMock__factory + )) as unknown as ArbitratorMock__factory const arbitratorMock = (await ArbitratorMock.deploy( testToken.address )) as ArbitratorMock @@ -121,7 +121,7 @@ describe('Govern Queue', function () { // add tokens for schedule, challenge and fee amounts from arbitrator const TestToken = (await ethers.getContractFactory( 'TestToken' - )) as TestToken__factory + )) as unknown as TestToken__factory testToken = (await TestToken.deploy(ownerAddr)) as TestToken await testToken.mint(ownerAddr, 1000000) @@ -140,13 +140,13 @@ describe('Govern Queue', function () { // add ERC3000 executor const ERC3000ExecutorMock = (await ethers.getContractFactory( 'ERC3000ExecutorMock' - )) as ERC3000ExecutorMock__factory + )) as unknown as ERC3000ExecutorMock__factory executor = await ERC3000ExecutorMock.deploy() container.payload.executor = executor.address const GQ = (await ethers.getContractFactory( 'GovernQueue' - )) as GovernQueue__factory + )) as unknown as GovernQueue__factory gq = (await GQ.deploy(ownerAddr, container.config)) as GovernQueue @@ -437,7 +437,7 @@ describe('Govern Queue', function () { it('reverts when arbitrator subject does not match the queue address', async () => { const ArbitratorMock = (await ethers.getContractFactory( 'ArbitratorWrongSubjectMock' - )) as ArbitratorWrongSubjectMock__factory + )) as unknown as ArbitratorWrongSubjectMock__factory const arbitratorMock = await ArbitratorMock.deploy(testToken.address) container.config.resolver = arbitratorMock.address @@ -519,7 +519,7 @@ describe('Govern Queue', function () { const eventContract = new Contract( gq.address, unlockedEventAbi, - gq.provider + // gq.provider ) await expect(gq.resolve(container, disputeId)) @@ -579,7 +579,7 @@ describe('Govern Queue', function () { const eventContract = new Contract( gq.address, unlockedEventAbi, - gq.provider + // gq.provider ) await expect(gq.veto(container, '0x02')) @@ -608,7 +608,7 @@ describe('Govern Queue', function () { const ArbitratorMock = (await ethers.getContractFactory( 'ArbitratorMock' - )) as ArbitratorMock__factory + )) as unknown as ArbitratorMock__factory const arbitratorMock = await ArbitratorMock.deploy(testToken.address) container.config.resolver = arbitratorMock.address @@ -625,7 +625,7 @@ describe('Govern Queue', function () { const eventContract = new Contract( gq.address, unlockedEventAbi, - gq.provider + // gq.provider ) await expect(gq.veto(container, '0x02')) .to.emit(eventContract, EVENTS.UNLOCK) diff --git a/packages/govern-create/test/govern-base-factory-e2e.test.ts b/packages/govern-create/test/govern-base-factory-e2e.test.ts index 126add75a..1e0d5473d 100644 --- a/packages/govern-create/test/govern-base-factory-e2e.test.ts +++ b/packages/govern-create/test/govern-base-factory-e2e.test.ts @@ -148,22 +148,22 @@ describe('Govern Base Factory with the real contracts(NO MOCKs)', function () { governRegistry = (await ethers.getContractAt( 'GovernRegistry', (await deployments.get('GovernRegistry')).address - )) as GovernRegistry + )) as unknown as GovernRegistry governQueueFactory = (await ethers.getContractAt( 'GovernRegistry', (await deployments.get('GovernQueueFactory')).address - )) as GovernRegistry + )) as unknown as GovernRegistry governTokenFactory = (await ethers.getContractAt( 'GovernRegistry', (await deployments.get('GovernTokenFactory')).address - )) as GovernRegistry + )) as unknown as GovernRegistry governFactory = (await ethers.getContractAt( 'GovernRegistry', (await deployments.get('GovernFactory')).address - )) as GovernRegistry + )) as unknown as GovernRegistry const { abi, baseFactoryBytecode } = await getMergedABI(); diff --git a/packages/govern-create/test/govern-base-factory-unit.test.ts b/packages/govern-create/test/govern-base-factory-unit.test.ts index a07d5ef56..f7e466d67 100644 --- a/packages/govern-create/test/govern-base-factory-unit.test.ts +++ b/packages/govern-create/test/govern-base-factory-unit.test.ts @@ -33,24 +33,24 @@ describe('Govern Base Factory with mocked contracts', function () { // Deploy Mocks GovernQueueFactoryMock = await ((await ethers.getContractFactory( 'GovernQueueFactoryMock' - )) as GovernQueueFactoryMock__factory).deploy() + )) as unknown as GovernQueueFactoryMock__factory).deploy() GovernTokenFactoryMock = await ((await ethers.getContractFactory( 'GovernTokenFactoryMock' - )) as GovernTokenFactoryMock__factory).deploy() + )) as unknown as GovernTokenFactoryMock__factory).deploy() GovernFactoryMock = await ((await ethers.getContractFactory( 'GovernFactoryMock' - )) as GovernFactoryMock__factory).deploy() + )) as unknown as GovernFactoryMock__factory).deploy() GovernRegistryMock = await ((await ethers.getContractFactory( 'GovernRegistryMock' - )) as GovernRegistryMock__factory).deploy() + )) as unknown as GovernRegistryMock__factory).deploy() // Deploy the GovernBaseFactory GovernBaseFactory = await ((await ethers.getContractFactory( 'GovernBaseFactory' - )) as GovernBaseFactory__factory).deploy( + )) as unknown as GovernBaseFactory__factory).deploy( GovernRegistryMock.address, GovernFactoryMock.address, GovernQueueFactoryMock.address, diff --git a/yarn.lock b/yarn.lock index 89b5ee8b9..182a67222 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9301,7 +9301,7 @@ concat-stream@^1.5.0, concat-stream@^1.5.1, concat-stream@~1.6.2: concat-stream@^2.0.0, "concat-stream@github:hugomrdias/concat-stream#feat/smaller": version "2.0.0" - resolved "https://codeload.github.com/hugomrdias/concat-stream/tar.gz/057bc7b5d6d8df26c8cf00a3f151b6721a0a8034" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" dependencies: inherits "^2.0.3" readable-stream "^3.0.2"