get scenarios working with chainid in forkspec

compound-finance · Mar 4, 2022 · 2f7e233 · 2f7e233
1 parent a7ac19a
commit 2f7e233
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/deployments/fuji/relations.ts b/deployments/fuji/relations.ts
@@ -4,6 +4,9 @@ import baseRelationConfig from '../relations';
 export default {
   ...baseRelationConfig,
   'comet:implementation': {
+    proxy: {
+      field: (comet) => (comet.extensionDelegate ? comet.extensionDelegate() : null),
+    },
     relations: {},
   },
 };
diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -158,11 +158,13 @@ const config: HardhatUserConfig = {
       },
       {
         name: 'kovan',
+        chainId: 42,
         url: getDefaultProviderURL('kovan'),
         allocation: 0.1, // eth
       },
       {
         name: 'fuji',
+        chainId: 43113,
         url: 'https://api.avax-test.network/ext/bc/C/rpc',
       },
     ],

diff --git a/plugins/scenario/World.ts b/plugins/scenario/World.ts
@@ -7,6 +7,7 @@ export type ForkSpec = {
   url?: string;
   blockNumber?: number;
   allocation?: number;
+  chainId?: number;
 };
 
 export class World {

diff --git a/plugins/scenario/utils/hreForBase.ts b/plugins/scenario/utils/hreForBase.ts
@@ -73,6 +73,7 @@ function hreForBase(base: ForkSpec): HardhatRuntimeEnvironment {
         ...(base.blockNumber && { blockNumber: base.blockNumber }),
       },
     },
+    ...(base.chainId ? { chainId: base.chainId } : {}),
   };
 
   const forkedConfig = {

diff --git a/scenario/context/CometActor.ts b/scenario/context/CometActor.ts
@@ -81,9 +81,7 @@ export default class CometActor {
 
   async transferAssetFrom({ src, dst, asset, amount }) {
     let comet = await this.context.getComet();
-    await (
-      await comet.connect(this.signer).transferAssetFrom(src, dst, asset, amount)
-    ).wait();
+    await (await comet.connect(this.signer).transferAssetFrom(src, dst, asset, amount)).wait();
   }
 
   async signAuthorization({
@@ -98,7 +96,7 @@ export default class CometActor {
     nonce: BigNumberish;
     expiry: number;
     chainId: number;
-  }) {
+  }): Promise<Signature> {
     let comet = await this.context.getComet();
     const domain = {
       name: await comet.name(),
@@ -144,8 +142,6 @@ export default class CometActor {
 
   async withdrawReserves(to: CometActor, amount: number) {
     let comet = await this.context.getComet();
-    await (
-      await comet.connect(this.signer).withdrawReserves(to.address, amount)
-    ).wait();
+    await (await comet.connect(this.signer).withdrawReserves(to.address, amount)).wait();
   }
 }