From 0edced020d1a48eaeb65cb9aaec3ef1fe087ac92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillermo=20D=C3=ADaz?= <guillermo@otherplane.com>
Date: Tue, 24 Oct 2023 16:54:21 +0200
Subject: [PATCH 1/4] chore: bypass all pfs in scroll.mainnet

---
 migrations/addresses.json | 7 +++++++
 package.json              | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/migrations/addresses.json b/migrations/addresses.json
index 4315f43..c6a99db 100644
--- a/migrations/addresses.json
+++ b/migrations/addresses.json
@@ -435,6 +435,13 @@
             "UniUsdPriceFeed": "0x8d0af33230C1d28bc8f4fB579F3726E0362bad66",
             "UsdcUsdPriceFeed": "0x420dCE64119700948586d48cF06401faF76789bD",
             "WitnetPriceFeedBypass": "0x0fab02a4E2fE4976c2c89470622bc63a46A9096a"
+        },
+        "scroll.mainnet": {
+            "BtcUsdPriceFeed": "0x2FBA3Aad4F2e2BBC562b4fdA76D82e8036dbEd3c",
+            "EthUsdPriceFeed": "0x6C74Aa59D58c0C2A26B07845dC607CD3fECF6B90",
+            "UniUsdPriceFeed": "0x96a215587C06EeAADDc51feDF8C5918a59970CE3",
+            "UsdcUsdPriceFeed": "0x0dAc06Ca814b6238524FcB2044108fa112aDf199",
+            "WitnetPriceFeedBypass": "0xC467B6E0F700D3E044C9F20BB76957eEC0B33c8C"
         }
     },
     "smartbch": {
diff --git a/package.json b/package.json
index cccc8b4..47c743f 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
     "ado-contracts": "^1.0.0",
     "lodash": "^4.17.21",
     "openzeppelin-solidity": "^2.4.0",
-    "witnet-solidity-bridge": "https://github.com/guidiaz/witnet-solidity-bridge#8f45b2999ec7c8b318b79dfcbf9e97510a0e1fb1"
+    "witnet-solidity-bridge": "https://github.com/guidiaz/witnet-solidity-bridge#58fc1a285cbaee7aaf5d9ebd08de8fc65ed0cd69"
   },
   "devDependencies": {
     "@babel/cli": "^7.5.5",

From 92738c551b8cfd65cf0b0004c6b4092fc85c723f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillermo=20D=C3=ADaz?= <guillermo@otherplane.com>
Date: Wed, 25 Oct 2023 19:10:45 +0200
Subject: [PATCH 2/4] chore: bypass all pfs in ethereum.sepolia

---
 migrations/addresses.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/migrations/addresses.json b/migrations/addresses.json
index c6a99db..4b1a221 100644
--- a/migrations/addresses.json
+++ b/migrations/addresses.json
@@ -5,6 +5,10 @@
             "EthUsdPriceFeed": "0x94E4851bdb089Af8D4b2D2f3528A24f36D3E8d7D",
             "WitnetPriceFeedBypass": "0xA8767A6EA3099De344499B35f725A38E3cD15562"
         },
+        "ethereum.sepolia": {
+            "EthUsdPriceFeed": "0x50f7cECd06b6377F952b6c2B5a891624F4C7b5b0",
+            "WitnetPriceFeedBypass": "0xd6d4B24219751A7725ce972E68B1067Ee57CC85a"
+        },
         "ethereum.mainnet": {
             "EthUsdPriceFeed": "0x0Dd81412825b9C3960195ab47F14dFa9Fd70e36e"
         }

From bcd9a501f0f5a335194ca739e1d8dbe53f427fc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillermo=20D=C3=ADaz?= <guillermo@otherplane.com>
Date: Wed, 25 Oct 2023 19:10:57 +0200
Subject: [PATCH 3/4] chore: bypass all pfs in scroll.sepolia

---
 migrations/addresses.json | 12 ++++++------
 package.json              |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/migrations/addresses.json b/migrations/addresses.json
index 4b1a221..c73d693 100644
--- a/migrations/addresses.json
+++ b/migrations/addresses.json
@@ -433,12 +433,12 @@
         }
     },
     "scroll": {
-        "scroll.goerli": {
-            "BtcUsdPriceFeed": "0x8bb3DDbA9a6A0647C9287166AFAc6b589a05314d",
-            "EthUsdPriceFeed": "0xf45eEd6a7cB76a415050D17592D90A6eB707D962",
-            "UniUsdPriceFeed": "0x8d0af33230C1d28bc8f4fB579F3726E0362bad66",
-            "UsdcUsdPriceFeed": "0x420dCE64119700948586d48cF06401faF76789bD",
-            "WitnetPriceFeedBypass": "0x0fab02a4E2fE4976c2c89470622bc63a46A9096a"
+        "scroll.sepolia": {
+            "BtcUsdPriceFeed": "0xe184Bd4f4A2A9AF38642E3595Aa004b071934B58",
+            "EthUsdPriceFeed": "0x08A30c218fB4E0357639E1984caec232a7108411",
+            "UniUsdPriceFeed": "0x27190703F0b64F8fAfcf3c0e76649040afBE26C6",
+            "UsdcUsdPriceFeed": "0x830a48FEf29e155A38238E7cF5728336Bd87c533",
+            "WitnetPriceFeedBypass": "0xB772f86004330738C1529cC1b0327D24aeF8c370"
         },
         "scroll.mainnet": {
             "BtcUsdPriceFeed": "0x2FBA3Aad4F2e2BBC562b4fdA76D82e8036dbEd3c",
diff --git a/package.json b/package.json
index 47c743f..bab1afc 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
     "ado-contracts": "^1.0.0",
     "lodash": "^4.17.21",
     "openzeppelin-solidity": "^2.4.0",
-    "witnet-solidity-bridge": "https://github.com/guidiaz/witnet-solidity-bridge#58fc1a285cbaee7aaf5d9ebd08de8fc65ed0cd69"
+    "witnet-solidity-bridge": "https://github.com/guidiaz/witnet-solidity-bridge#bb9c9a56c907274c2d835dd609afd819774c5204"
   },
   "devDependencies": {
     "@babel/cli": "^7.5.5",

From 49bbfdf3fc813c703c4b3568e95d156705150b97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillermo=20D=C3=ADaz?= <guillermo@otherplane.com>
Date: Wed, 15 Nov 2023 10:23:58 +0100
Subject: [PATCH 4/4] chore: bypass additional pfs on meter.testnet

---
 migrations/addresses.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/migrations/addresses.json b/migrations/addresses.json
index c73d693..cbe532a 100644
--- a/migrations/addresses.json
+++ b/migrations/addresses.json
@@ -308,8 +308,11 @@
     },
     "meter": {
         "meter.testnet": {
+            "BtcUsdPriceFeed": "0x6D071177F2399Ee362f56B52e130abB1679a5D41",
+            "EthUsdPriceFeed": "0x86790eBE0960A11B8dFF195a1CC2e9A0861cE176",
             "MtrgUsdtPriceFeed": "0x68529970B6055998d9911320E3dBB29dD9406849",
             "MtrUsdtPriceFeed": "0x94ECbA85dcE3679a1FD737964e974e63E2db91AF",
+            "UsdcUsdPriceFeed": "0xDB0dE4980627e958813fEFA5746C75a43da462Bb",
             "WitnetPriceFeedBypass": "0x7D0c8Fc63104B33d26F5734Ebc986E630DC7e004"
         },
         "meter.mainnet": {