Merge pull request #117 from OpenZeppelin/plat-2592-support-for-scrol…

…l-network Add support for scroll sepolia network
OpenZeppelin · Oct 11, 2023 · 66eff5d · 66eff5d
2 parents 30199f7 + 479f86d
commit 66eff5d
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 43 deletions.
diff --git a/examples/create-batch-proposal/index.js b/examples/create-batch-proposal/index.js
@@ -10,15 +10,13 @@ const contracts = [
     address: ERC20Token,
     name: 'ERC20 Token',
     network: 'goerli',
-    abi:
-      '[{"inputs":[{"internalType":"uint256","name":"_amount","type":"uint256"}],"name":"mint","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"}],"name":"transfer","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"}]',
+    abi: '[{"inputs":[{"internalType":"uint256","name":"_amount","type":"uint256"}],"name":"mint","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"}],"name":"transfer","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"}]',
   },
   {
     address: RolesContract,
     network: 'goerli',
     name: 'Roles Contract',
-    abi:
-      '[{"inputs":[{"internalType":"bytes32","name":"role","type":"bytes32"},{"internalType":"address","name":"account","type":"address"}],"name":"grantRole","outputs":[],"stateMutability":"nonpayable","type":"function"}]',
+    abi: '[{"inputs":[{"internalType":"bytes32","name":"role","type":"bytes32"},{"internalType":"address","name":"account","type":"address"}],"name":"grantRole","outputs":[],"stateMutability":"nonpayable","type":"function"}]',
   },
 ];
 

diff --git a/packages/base/src/api/__mocks__/axios-error.ts b/packages/base/src/api/__mocks__/axios-error.ts
@@ -6,13 +6,13 @@ export const mockAxiosError: AxiosError = {
   config: {
     url: '/relayer',
     method: 'get',
-    headers: ({
+    headers: {
       'Accept': 'application/json, text/plain, */*',
       'X-Api-Key': '4Rfp2GEHDjgesA6MdseUM1n8B8kT9hgs',
       'Authorization': 'Bearer WRONG',
       'Content-Type': 'application/json',
       'User-Agent': 'axios/0.21.4',
-    } as unknown) as AxiosRequestHeaders,
+    } as unknown as AxiosRequestHeaders,
     baseURL: 'https://defender-api.openzeppelin.com/',
     timeout: 0,
     xsrfCookieName: 'XSRF-TOKEN',
@@ -142,13 +142,13 @@ export const mockAxiosError: AxiosError = {
       maxContentLength: -1,
       maxBodyLength: -1,
       data: undefined,
-      headers: ({
+      headers: {
         'Accept': 'application/json, text/plain, */*',
         'X-Api-Key': '4Rfp2GEHDjgesA6MdseUM1n8B8kT9hgs',
         'Authorization': 'Bearer WRONG',
         'Content-Type': 'application/json',
         'User-Agent': 'axios/0.21.4',
-      } as unknown) as AxiosRequestHeaders,
+      } as unknown as AxiosRequestHeaders,
     },
     request: {
       _eventsCount: 7,

diff --git a/packages/base/src/utils/network.ts b/packages/base/src/utils/network.ts
@@ -39,7 +39,8 @@ export type PublicNetwork =
   | 'base-goerli'
   | 'linea-goerli'
   | 'linea'
-  | 'mantle';
+  | 'mantle'
+  | 'scroll-sepolia';
 export type CustomNetwork = 'x-dfk-avax-chain' | 'x-dfk-avax-chain-test' | 'x-security-alliance';
 export type ForkedNetwork = string;
 
@@ -84,6 +85,7 @@ export const Networks: Network[] = [
   'x-dfk-avax-chain-test',
   'x-security-alliance',
   'mantle',
+  'scroll-sepolia',
 ];
 
 export function isValidNetwork(text: string): text is Network {
@@ -139,4 +141,5 @@ const chainIds: { [key in Network]: number } = {
   'x-dfk-avax-chain-test': 335,
   'x-security-alliance': 888,
   'mantle': 5000,
+  'scroll-sepolia': 534351,
 };
diff --git a/packages/deploy/src/api/block-explorer-api-key.test.ts b/packages/deploy/src/api/block-explorer-api-key.test.ts
@@ -20,10 +20,10 @@ describe('Block Explorer Api Key Client', () => {
     key: 'random-key',
   };
   beforeEach(() => {
-    client = (new DeployClient({
+    client = new DeployClient({
       apiKey: 'key',
       apiSecret: 'secret',
-    }) as unknown) as TestClient<DeployClient>;
+    }) as unknown as TestClient<DeployClient>;
     createAuthenticatedApi.mockClear();
   });
   describe('constructor', () => {

diff --git a/packages/deploy/src/api/deployment.test.ts b/packages/deploy/src/api/deployment.test.ts
@@ -20,10 +20,10 @@ describe('Deploy Client', () => {
     verifySourceCode: true,
   };
   beforeEach(() => {
-    deployClient = (new DeployClient({
+    deployClient = new DeployClient({
       apiKey: 'key',
       apiSecret: 'secret',
-    }) as unknown) as TestClient<DeployClient>;
+    }) as unknown as TestClient<DeployClient>;
     createAuthenticatedApi.mockClear();
   });
   describe('constructor', () => {

diff --git a/packages/monitor/src/api/index.test.ts b/packages/monitor/src/api/index.test.ts
@@ -119,7 +119,7 @@ describe('MonitorClient', () => {
   };
 
   beforeEach(() => {
-    monitor = (new MonitorClient({ apiKey: 'key', apiSecret: 'secret' }) as unknown) as TestMonitorClient;
+    monitor = new MonitorClient({ apiKey: 'key', apiSecret: 'secret' }) as unknown as TestMonitorClient;
     createAuthenticatedApi.mockClear();
     listBlockwatchersSpy = jest.spyOn(monitor, 'listBlockwatchers').mockImplementation(async () => [
       {
@@ -184,17 +184,8 @@ describe('MonitorClient', () => {
 
   describe('create', () => {
     it('passes correct BLOCK type arguments to the API', async () => {
-      const {
-        name,
-        network,
-        paused,
-        type,
-        addresses,
-        abi,
-        txCondition,
-        eventConditions,
-        functionConditions,
-      } = createBlockPayload;
+      const { name, network, paused, type, addresses, abi, txCondition, eventConditions, functionConditions } =
+        createBlockPayload;
 
       const expectedApiRequest = {
         paused,
@@ -301,17 +292,8 @@ describe('MonitorClient', () => {
     it('passes correct BLOCK type arguments to the API', async () => {
       jest.spyOn(monitor, 'get').mockImplementation(async () => oldBlockMonitor);
 
-      const {
-        name,
-        network,
-        paused,
-        type,
-        addresses,
-        abi,
-        txCondition,
-        eventConditions,
-        functionConditions,
-      } = createBlockPayload;
+      const { name, network, paused, type, addresses, abi, txCondition, eventConditions, functionConditions } =
+        createBlockPayload;
 
       const expectedApiRequest = {
         paused,

diff --git a/packages/network/src/api/index.test.ts b/packages/network/src/api/index.test.ts
@@ -27,7 +27,7 @@ describe('NetworkClient', () => {
   let networkClient: TestNetworkClient;
 
   beforeEach(() => {
-    networkClient = (new NetworkClient({ apiKey: 'key', apiSecret: 'secret' }) as unknown) as TestNetworkClient;
+    networkClient = new NetworkClient({ apiKey: 'key', apiSecret: 'secret' }) as unknown as TestNetworkClient;
     createAuthenticatedApi.mockClear();
   });
 

diff --git a/packages/proposal/src/models/simulation.ts b/packages/proposal/src/models/simulation.ts
@@ -9,7 +9,7 @@ export type Log = [
   Address | string[] | string,
   Address | string[] | string,
   Address | string[] | string,
-  ...(Address | string[] | string)[]
+  ...(Address | string[] | string)[],
 ];
 export type BigUInt = string | string | number;
 

diff --git a/packages/relay-signer/src/action/index-rate.test.ts b/packages/relay-signer/src/action/index-rate.test.ts
@@ -32,10 +32,10 @@ describe('ActionRelayer', () => {
   let relayer: TestActionRelayer;
 
   beforeEach(async function () {
-    relayer = (new ActionRelayer({
+    relayer = new ActionRelayer({
       credentials: JSON.stringify(credentials),
       relayerARN: 'arn',
-    }) as unknown) as TestActionRelayer;
+    }) as unknown as TestActionRelayer;
   });
 
   describe('get rate limited', () => {

diff --git a/packages/relay-signer/src/action/index.test.ts b/packages/relay-signer/src/action/index.test.ts
@@ -21,10 +21,10 @@ describe('ActionRelayer', () => {
   let relayer: TestActionRelayer;
 
   beforeEach(async function () {
-    relayer = (new ActionRelayer({
+    relayer = new ActionRelayer({
       credentials: JSON.stringify(credentials),
       relayerARN: 'arn',
-    }) as unknown) as TestActionRelayer;
+    }) as unknown as TestActionRelayer;
   });
 
   describe('constructor', () => {

diff --git a/packages/relay-signer/src/ethers/provider.ts b/packages/relay-signer/src/ethers/provider.ts
@@ -75,6 +75,6 @@ export class DefenderRelayProvider extends StaticJsonRpcProvider {
   }
 
   getSigner(): JsonRpcSigner {
-    return (new DefenderRelaySigner(this.relayer, this, {}) as any) as JsonRpcSigner;
+    return new DefenderRelaySigner(this.relayer, this, {}) as any as JsonRpcSigner;
   }
 }