Refactor to allow for single sponsorWallet updates

local-test-configuration/airnode-feed-1/airnode-feed.json

@@ -22,14 +22,12 @@
   "triggers": {
     "signedApiUpdates": [
       {
-        "signedApiName": "localhost",
         "templateIds": [
           "0xa5419706d8edb3bbafad83fe2b4e7dc851de5e4cd9529f9f27bb393016c81ae5",
           "0x8f255387c5fdb03117d82372b8fa5c7813881fd9a8202b7cc373f1a5868496b2",
           "0x89bbdb4e2d7510abf1ca0ed53295e31c00a6939fc12e77d67bf3a4cb3c31f61c"
         ],
-        "fetchInterval": 10,
-        "updateDelay": 0
+        "fetchInterval": 10
       }
     ]
   },
@@ -94,7 +92,7 @@
     }
   ],
   "nodeSettings": {
-    "nodeVersion": "0.4.0",
+    "nodeVersion": "1.0.0",
     "airnodeWalletMnemonic": "${AIRNODE_WALLET_MNEMONIC}",
     "stage": "local-example"
   }

local-test-configuration/airnode-feed-2/airnode-feed.json

@@ -22,14 +22,12 @@
   "triggers": {
     "signedApiUpdates": [
       {
-        "signedApiName": "localhost",
         "templateIds": [
           "0xa5419706d8edb3bbafad83fe2b4e7dc851de5e4cd9529f9f27bb393016c81ae5",
           "0x8f255387c5fdb03117d82372b8fa5c7813881fd9a8202b7cc373f1a5868496b2",
           "0x89bbdb4e2d7510abf1ca0ed53295e31c00a6939fc12e77d67bf3a4cb3c31f61c"
         ],
-        "fetchInterval": 20,
-        "updateDelay": 60
+        "fetchInterval": 20
       }
     ]
   },
@@ -94,7 +92,7 @@
     }
   ],
   "nodeSettings": {
-    "nodeVersion": "0.4.0",
+    "nodeVersion": "1.0.0",
     "airnodeWalletMnemonic": "${AIRNODE_WALLET_MNEMONIC}",
     "stage": "local-example"
   }

local-test-configuration/monitoring/index.html

@@ -730,10 +730,13 @@ <h2>Active data feeds</h2>
     const rpcUrl = urlParams.get('rpcUrl'),
       airseekerRegistryAddress = urlParams.get('airseekerRegistryAddress'),
       airseekerMnemonic = decodeURIComponent(urlParams.get('airseekerMnemonic')),
-      walletDerivationScheme = decodeURIComponent(urlParams.get('walletDerivationScheme'));
+      walletDerivationScheme = decodeURIComponent(urlParams.get('walletDerivationScheme')),
+      sponsorAddress = decodeURIComponent(urlParams.get('sponsorAddress'));
 
     if (!airseekerRegistryAddress) throw new Error('airseekerRegistryAddress must be provided as URL parameter');
     if (!airseekerMnemonic) throw new Error('airseekerMnemonic must be provided as URL parameter');
+    if (walletDerivationScheme === 'fallback' && !sponsorAddress)
+      throw new Error('sponsorAddress must be provided as URL parameter when walletDerivationScheme is "fallback"');
 
     // See: https://github.com/GoogleChromeLabs/jsbi/issues/30#issuecomment-953187833
     BigInt.prototype.toJSON = function () {
@@ -876,10 +879,18 @@ <h2>Active data feeds</h2>
       //
       // For self-funded feeds it's more suitable to derive the hash also from update parameters. This does not apply to
       // mananaged feeds which want to be funded by the same wallet independently of the update parameters.
-      const sponsorAddressHash =
-        walletDerivationScheme === 'self-funded'
-          ? deriveSponsorAddressHashForSelfFundedFeed(dapiNameOrDataFeedId, updateParameters)
-          : deriveSponsorAddressHashForManagedFeed(dapiNameOrDataFeedId);
+      let sponsorAddressHash;
+      switch (walletDerivationScheme.type) {
+        case 'self-funded':
+          sponsorAddressHash = deriveSponsorAddressHashForSelfFundedFeed(dapiNameOrDataFeedId, updateParameters);
+          break;
+        case 'managed':
+          sponsorAddressHash = deriveSponsorAddressHashForManagedFeed(dapiNameOrDataFeedId);
+          break;
+        case 'fallback':
+          sponsorAddressHash = walletDerivationScheme.sponsorAddress;
+          break;
+      }
 
       return deriveSponsorWalletFromSponsorAddressHash(sponsorWalletMnemonic, sponsorAddressHash);
     };
@@ -938,7 +949,10 @@ <h2>Active data feeds</h2>
           airseekerMnemonic,
           dapiName ?? dataFeed.dataFeedId,
           updateParameters,
-          walletDerivationScheme
+          {
+            type: walletDerivationScheme,
+            ...(sponsorAddress && { sponsorAddress }),
+          }
         );
         const dataFeedInfo = {
           dapiName: dapiName,