Enable cross-chain authorizers

api3dao · Oct 4, 2022 · aa4c3dc · aa4c3dc
1 parent 5d1022a
commit aa4c3dc
Show file tree

Hide file tree

Showing 41 changed files with 236 additions and 33 deletions.
diff --git a/.changeset/wild-walls-beg.md b/.changeset/wild-walls-beg.md
@@ -0,0 +1,9 @@
+---
+'@api3/airnode-deployer': minor
+'@api3/airnode-examples': minor
+'@api3/airnode-node': minor
+'@api3/airnode-operation': minor
+'@api3/airnode-validator': minor
+---
+
+Enable cross-chain authorizers
diff --git a/packages/airnode-deployer/config/config.example.json b/packages/airnode-deployer/config/config.example.json
@@ -3,7 +3,8 @@
     {
       "maxConcurrency": 100,
       "authorizers": {
-        "requesterEndpointAuthorizers": []
+        "requesterEndpointAuthorizers": [],
+        "crossChainRequesterAuthorizers": []
       },
       "authorizations": {
         "requesterEndpointAuthorizations": {}

diff --git a/packages/airnode-deployer/test/fixtures/config.valid.json b/packages/airnode-deployer/test/fixtures/config.valid.json
@@ -3,7 +3,8 @@
     {
       "maxConcurrency": 100,
       "authorizers": {
-        "requesterEndpointAuthorizers": []
+        "requesterEndpointAuthorizers": [],
+        "crossChainRequesterAuthorizers": []
       },
       "authorizations": {
         "requesterEndpointAuthorizations": {}

diff --git a/packages/airnode-examples/integrations/authenticated-coinmarketcap/config.example.json b/packages/airnode-examples/integrations/authenticated-coinmarketcap/config.example.json
@@ -3,7 +3,8 @@
     {
       "maxConcurrency": 100,
       "authorizers": {
-        "requesterEndpointAuthorizers": []
+        "requesterEndpointAuthorizers": [],
+        "crossChainRequesterAuthorizers": []
       },
       "authorizations": {
         "requesterEndpointAuthorizations": {}

diff --git a/packages/airnode-examples/integrations/authenticated-coinmarketcap/create-config.ts b/packages/airnode-examples/integrations/authenticated-coinmarketcap/create-config.ts
@@ -13,6 +13,7 @@ const createConfig = async (generateExampleFile: boolean): Promise<Config> => ({
       maxConcurrency: 100,
       authorizers: {
         requesterEndpointAuthorizers: [],
+        crossChainRequesterAuthorizers: [],
       },
       authorizations: {
         requesterEndpointAuthorizations: {},

diff --git a/packages/airnode-examples/integrations/coingecko-post-processing/config.example.json b/packages/airnode-examples/integrations/coingecko-post-processing/config.example.json
@@ -3,7 +3,8 @@
     {
       "maxConcurrency": 100,
       "authorizers": {
-        "requesterEndpointAuthorizers": []
+        "requesterEndpointAuthorizers": [],
+        "crossChainRequesterAuthorizers": []
       },
       "authorizations": {
         "requesterEndpointAuthorizations": {}

diff --git a/packages/airnode-examples/integrations/coingecko-post-processing/create-config.ts b/packages/airnode-examples/integrations/coingecko-post-processing/create-config.ts
@@ -13,6 +13,7 @@ const createConfig = async (generateExampleFile: boolean): Promise<Config> => ({
       maxConcurrency: 100,
       authorizers: {
         requesterEndpointAuthorizers: [],
+        crossChainRequesterAuthorizers: [],
       },
       authorizations: {
         requesterEndpointAuthorizations: {},

diff --git a/packages/airnode-examples/integrations/coingecko-pre-processing/config.example.json b/packages/airnode-examples/integrations/coingecko-pre-processing/config.example.json
@@ -3,7 +3,8 @@
     {
       "maxConcurrency": 100,
       "authorizers": {
-        "requesterEndpointAuthorizers": []
+        "requesterEndpointAuthorizers": [],
+        "crossChainRequesterAuthorizers": []
       },
       "authorizations": {
         "requesterEndpointAuthorizations": {}

diff --git a/packages/airnode-examples/integrations/coingecko-pre-processing/create-config.ts b/packages/airnode-examples/integrations/coingecko-pre-processing/create-config.ts
@@ -13,6 +13,7 @@ const createConfig = async (generateExampleFile: boolean): Promise<Config> => ({
       maxConcurrency: 100,
       authorizers: {
         requesterEndpointAuthorizers: [],
+        crossChainRequesterAuthorizers: [],
       },
       authorizations: {
         requesterEndpointAuthorizations: {},

diff --git a/packages/airnode-examples/integrations/coingecko-signed-data/config.example.json b/packages/airnode-examples/integrations/coingecko-signed-data/config.example.json
@@ -3,7 +3,8 @@
     {
       "maxConcurrency": 100,
       "authorizers": {
-        "requesterEndpointAuthorizers": []
+        "requesterEndpointAuthorizers": [],
+        "crossChainRequesterAuthorizers": []
       },
       "authorizations": {
         "requesterEndpointAuthorizations": {}

diff --git a/packages/airnode-examples/integrations/coingecko-signed-data/create-config.ts b/packages/airnode-examples/integrations/coingecko-signed-data/create-config.ts
@@ -13,6 +13,7 @@ const createConfig = async (generateExampleFile: boolean): Promise<Config> => ({
       maxConcurrency: 100,
       authorizers: {
         requesterEndpointAuthorizers: [],
+        crossChainRequesterAuthorizers: [],
       },
       authorizations: {
         requesterEndpointAuthorizations: {},

diff --git a/packages/airnode-examples/integrations/coingecko-template/config.example.json b/packages/airnode-examples/integrations/coingecko-template/config.example.json
@@ -3,7 +3,8 @@
     {
       "maxConcurrency": 100,
       "authorizers": {
-        "requesterEndpointAuthorizers": []
+        "requesterEndpointAuthorizers": [],
+        "crossChainRequesterAuthorizers": []
       },
       "authorizations": {
         "requesterEndpointAuthorizations": {}

diff --git a/packages/airnode-examples/integrations/coingecko-template/create-config.ts b/packages/airnode-examples/integrations/coingecko-template/create-config.ts
@@ -14,6 +14,7 @@ const createConfig = async (generateExampleFile: boolean): Promise<Config> => ({
       maxConcurrency: 100,
       authorizers: {
         requesterEndpointAuthorizers: [],
+        crossChainRequesterAuthorizers: [],
       },
       authorizations: {
         requesterEndpointAuthorizations: {},

diff --git a/packages/airnode-examples/integrations/coingecko-testable/config.example.json b/packages/airnode-examples/integrations/coingecko-testable/config.example.json
@@ -3,7 +3,8 @@
     {
       "maxConcurrency": 100,
       "authorizers": {
-        "requesterEndpointAuthorizers": []
+        "requesterEndpointAuthorizers": [],
+        "crossChainRequesterAuthorizers": []
       },
       "authorizations": {
         "requesterEndpointAuthorizations": {}

diff --git a/packages/airnode-examples/integrations/coingecko-testable/create-config.ts b/packages/airnode-examples/integrations/coingecko-testable/create-config.ts
@@ -13,6 +13,7 @@ const createConfig = async (generateExampleFile: boolean): Promise<Config> => ({
       maxConcurrency: 100,
       authorizers: {
         requesterEndpointAuthorizers: [],
+        crossChainRequesterAuthorizers: [],
       },
       authorizations: {
         requesterEndpointAuthorizations: {},

diff --git a/packages/airnode-examples/integrations/coingecko/config.example.json b/packages/airnode-examples/integrations/coingecko/config.example.json
@@ -3,7 +3,8 @@
     {
       "maxConcurrency": 100,
       "authorizers": {
-        "requesterEndpointAuthorizers": []
+        "requesterEndpointAuthorizers": [],
+        "crossChainRequesterAuthorizers": []
       },
       "authorizations": {
         "requesterEndpointAuthorizations": {}

diff --git a/packages/airnode-examples/integrations/coingecko/create-config.ts b/packages/airnode-examples/integrations/coingecko/create-config.ts
@@ -13,6 +13,7 @@ const createConfig = async (generateExampleFile: boolean): Promise<Config> => ({
       maxConcurrency: 100,
       authorizers: {
         requesterEndpointAuthorizers: [],
+        crossChainRequesterAuthorizers: [],
       },
       authorizations: {
         requesterEndpointAuthorizations: {},

diff --git a/packages/airnode-examples/integrations/failing-example/config.example.json b/packages/airnode-examples/integrations/failing-example/config.example.json
@@ -3,7 +3,8 @@
     {
       "maxConcurrency": 100,
       "authorizers": {
-        "requesterEndpointAuthorizers": []
+        "requesterEndpointAuthorizers": [],
+        "crossChainRequesterAuthorizers": []
       },
       "authorizations": {
         "requesterEndpointAuthorizations": {}

diff --git a/packages/airnode-examples/integrations/failing-example/create-config.ts b/packages/airnode-examples/integrations/failing-example/create-config.ts
@@ -13,6 +13,7 @@ const createConfig = async (generateExampleFile: boolean): Promise<Config> => ({
       maxConcurrency: 100,
       authorizers: {
         requesterEndpointAuthorizers: [],
+        crossChainRequesterAuthorizers: [],
       },
       authorizations: {
         requesterEndpointAuthorizations: {},

diff --git a/packages/airnode-examples/integrations/relay-security-schemes/config.example.json b/packages/airnode-examples/integrations/relay-security-schemes/config.example.json
@@ -3,7 +3,8 @@
     {
       "maxConcurrency": 100,
       "authorizers": {
-        "requesterEndpointAuthorizers": []
+        "requesterEndpointAuthorizers": [],
+        "crossChainRequesterAuthorizers": []
       },
       "authorizations": {
         "requesterEndpointAuthorizations": {}

diff --git a/packages/airnode-examples/integrations/relay-security-schemes/create-config.ts b/packages/airnode-examples/integrations/relay-security-schemes/create-config.ts
@@ -13,6 +13,7 @@ const createConfig = async (generateExampleFile: boolean): Promise<Config> => ({
       maxConcurrency: 100,
       authorizers: {
         requesterEndpointAuthorizers: [],
+        crossChainRequesterAuthorizers: [],
       },
       authorizations: {
         requesterEndpointAuthorizations: {},

diff --git a/packages/airnode-examples/integrations/weather-multi-value/config.example.json b/packages/airnode-examples/integrations/weather-multi-value/config.example.json
@@ -3,7 +3,8 @@
     {
       "maxConcurrency": 100,
       "authorizers": {
-        "requesterEndpointAuthorizers": []
+        "requesterEndpointAuthorizers": [],
+        "crossChainRequesterAuthorizers": []
       },
       "authorizations": {
         "requesterEndpointAuthorizations": {}

diff --git a/packages/airnode-examples/integrations/weather-multi-value/create-config.ts b/packages/airnode-examples/integrations/weather-multi-value/create-config.ts
@@ -13,6 +13,7 @@ const createConfig = async (generateExampleFile: boolean): Promise<Config> => ({
       maxConcurrency: 100,
       authorizers: {
         requesterEndpointAuthorizers: [],
+        crossChainRequesterAuthorizers: [],
       },
       authorizations: {
         requesterEndpointAuthorizations: {},

diff --git a/packages/airnode-node/config/config.example.json b/packages/airnode-node/config/config.example.json
@@ -3,7 +3,8 @@
     {
       "maxConcurrency": 100,
       "authorizers": {
-        "requesterEndpointAuthorizers": []
+        "requesterEndpointAuthorizers": [],
+        "crossChainRequesterAuthorizers": []
       },
       "authorizations": {
         "requesterEndpointAuthorizations": {}

diff --git a/packages/airnode-node/src/coordinator/calls/chain-limits.test.ts b/packages/airnode-node/src/coordinator/calls/chain-limits.test.ts
@@ -9,6 +9,7 @@ const createChainConfig = (overrides: Partial<ChainConfig>): ChainConfig => {
     maxConcurrency: 100,
     authorizers: {
       requesterEndpointAuthorizers: [],
+      crossChainRequesterAuthorizers: [],
     },
     authorizations: {
       requesterEndpointAuthorizations: {},

diff --git a/packages/airnode-node/src/evm/authorization/authorization-fetching.test.ts b/packages/airnode-node/src/evm/authorization/authorization-fetching.test.ts
@@ -24,6 +24,7 @@ describe('fetch (authorizations)', () => {
           '0x711c93B32c0D28a5d18feD87434cce11C3e5699B',
           '0x9E0e23766b0ed0C492804872c5164E9187fB56f5',
         ],
+        crossChainRequesterAuthorizers: [],
       },
       authorizations: {
         requesterEndpointAuthorizations: {},
@@ -41,7 +42,7 @@ describe('fetch (authorizations)', () => {
     expect(res).toEqual({});
   });
 
-  it('returns true for all pending requests if authorizers array is empty', async () => {
+  it('returns true for all pending requests if authorizers arrays are empty', async () => {
     const apiCalls = Array.from(Array(19).keys()).map((n) => {
       return fixtures.requests.buildApiCall({
         id: `${n}`,
@@ -52,7 +53,10 @@ describe('fetch (authorizations)', () => {
     });
     const [logs, res] = await authorization.fetch(apiCalls, {
       ...mutableFetchOptions,
-      authorizers: { requesterEndpointAuthorizers: [] },
+      authorizers: {
+        requesterEndpointAuthorizers: [],
+        crossChainRequesterAuthorizers: [],
+      },
     });
 
     expect(logs).toEqual([]);
@@ -318,7 +322,10 @@ describe('fetch (authorizations)', () => {
 });
 
 describe('fetchAuthorizationStatus', () => {
-  const authorizers = { requesterEndpointAuthorizers: ['0x0000000000000000000000000000000000000000'] };
+  const authorizers = {
+    requesterEndpointAuthorizers: ['0x0000000000000000000000000000000000000000'],
+    crossChainRequesterAuthorizers: [],
+  };
   const airnodeAddress = '0xairnodeAddress';
   let mutableAirnodeRrp: AirnodeRrpV0;
 

diff --git a/packages/airnode-node/src/evm/handlers/initialize-provider.test.ts b/packages/airnode-node/src/evm/handlers/initialize-provider.test.ts
@@ -10,8 +10,9 @@ mockEthers({
 
 import { ethers } from 'ethers';
 import * as adapter from '@api3/airnode-adapter';
-import { initializeProvider } from './initialize-provider';
+import { initializeProvider, mergeAuthorizationsByRequestId } from './initialize-provider';
 import * as fixtures from '../../../test/fixtures';
+import { AuthorizationByRequestId } from '../../types';
 
 describe('initializeProvider', () => {
   jest.setTimeout(30_000);
@@ -228,4 +229,31 @@ describe('initializeProvider', () => {
     expect(res).toEqual(null);
     expect(getLogsSpy).toHaveBeenCalledTimes(1);
   });
+
+  it('merges authorizations and cross-chain authorizations', () => {
+    const authorizations: AuthorizationByRequestId = {
+      '0x1': false,
+      '0x2': true,
+      '0x3': true,
+      '0x4': false,
+      '0x5': false,
+      '0x6': true,
+    };
+    const crossChainAuthorizations: AuthorizationByRequestId = {
+      '0x1': true,
+      '0x2': true,
+      '0x3': true,
+      '0x4': false,
+    };
+
+    const merged = mergeAuthorizationsByRequestId([authorizations, crossChainAuthorizations]);
+    expect(merged).toEqual({
+      '0x1': true,
+      '0x2': true,
+      '0x3': true,
+      '0x4': false,
+      '0x5': false,
+      '0x6': true,
+    } as AuthorizationByRequestId);
+  });
 });