Upgrade Access Viewer contracts across multiple chains, update implem…

…entation addresses, and modify Viewer contract to use `getAddress` instead of `getAccessPoint`. (#317)
KintoXYZ · Nov 20, 2024 · 8f2ea4e · 8f2ea4e
1 parent 6b9fc53
commit 8f2ea4e
Show file tree

Hide file tree

Showing 11 changed files with 507 additions and 221 deletions.
diff --git a/broadcast/146-upgrade-access-viewer.s.sol/1/run-latest.json b/broadcast/146-upgrade-access-viewer.s.sol/1/run-latest.json
diff --git a/broadcast/146-upgrade-access-viewer.s.sol/42161/run-1732068488.json b/broadcast/146-upgrade-access-viewer.s.sol/42161/run-1732068488.json
diff --git a/broadcast/146-upgrade-access-viewer.s.sol/42161/run-latest.json b/broadcast/146-upgrade-access-viewer.s.sol/42161/run-latest.json
diff --git a/broadcast/146-upgrade-access-viewer.s.sol/8453/run-1732068336.json b/broadcast/146-upgrade-access-viewer.s.sol/8453/run-1732068336.json
diff --git a/broadcast/146-upgrade-access-viewer.s.sol/8453/run-1732068412.json b/broadcast/146-upgrade-access-viewer.s.sol/8453/run-1732068412.json
diff --git a/broadcast/146-upgrade-access-viewer.s.sol/8453/run-latest.json b/broadcast/146-upgrade-access-viewer.s.sol/8453/run-latest.json
diff --git a/script/migrations/146-upgrade-access-viewer.s.sol b/script/migrations/146-upgrade-access-viewer.s.sol
@@ -26,6 +26,8 @@ contract DeployViewerScript is Script, MigrationHelper {
         vm.broadcast(deployerPrivateKey);
         viewer.upgradeTo(newImpl);
 
+        saveContractAddress("Viewer-impl", newImpl);
+
         require(viewer.getBalances(new address[](0), address(this)).length == 0, "getBalances not working");
     }
 }
diff --git a/src/viewers/Viewer.sol b/src/viewers/Viewer.sol
@@ -104,7 +104,7 @@ contract Viewer is Initializable, UUPSUpgradeable, OwnableUpgradeable {
         view
         returns (AccountData memory data)
     {
-        address accessPoint = address(accessRegistry.getAccessPoint(kintoSigner));
+        address accessPoint = address(accessRegistry.getAddress(kintoSigner));
         IAavePool pool = IAavePool(poolAddressProvider.getPool());
 
         // Initialize assets array in memory

diff --git a/test/artifacts/1/addresses.json b/test/artifacts/1/addresses.json
@@ -32,7 +32,7 @@
   "SwapWorkflow": "0xb12e92be0FB2689a966998569958dF560b55EB8D",
   "VestingContract": "0xeE22AdB85Cc238dFAe9E62f542a6aaa227f80960",
   "Viewer": "0x8888886e1d7c1468d7300cF08db89FFE68F29830",
-  "Viewer-impl": "0x053D6CAfEA290CACE8C56E26d092D76871999d50",
+  "Viewer-impl": "0x2bC608E6a65D9F8Cbf0E0eCBA9D8f55c59071271",
   "WethWorkflow": "0x19452D4C2b2422d0623e1A5F0Caa9a52C2Cf55B5",
   "WithdrawWorkflow": "0xdC70c1c6c49AC9B3cA50E2F9079843545646524a",
   "AaveLendWorkflow": "0x30592A2E419Db1338A6759279c547A9fdf2cd1DF",

diff --git a/test/artifacts/42161/addresses.json b/test/artifacts/42161/addresses.json
@@ -26,7 +26,7 @@
   "DummyAccessPoint-impl": "0x6936E7AC89eF4C03eC4b111Af6B4370bE46b6472",
   "SwapWorkflow": "0xc91D950d2F2a8F97B7e1ACc489AeC4Dc7CeF86E6",
   "Viewer": "0x8888886e1d7c1468d7300cF08db89FFE68F29830",
-  "Viewer-impl": "0x053D6CAfEA290CACE8C56E26d092D76871999d50",
+  "Viewer-impl": "0x80338A3f75614491c8DC383fFaA663b9a27CD05d",
   "WethWorkflow": "0x7F7c594eE170a62d7e7615972831038Cf7d4Fc1A",
   "WithdrawWorkflow": "0x36e6cA034958B2E0D4dC7Ea9a8151f15Ba0B27D2",
   "AaveLendWorkflow": "0xB47Ed636c8296729E81463109FEbf833CeEa71fb",

diff --git a/test/artifacts/8453/addresses.json b/test/artifacts/8453/addresses.json
@@ -21,7 +21,7 @@
   "DummyAccessPoint-impl": "0x6936E7AC89eF4C03eC4b111Af6B4370bE46b6472",
   "SwapWorkflow": "0x2FE89913dd94c63C3Cdf2B50C27b836E46005Dc6",
   "Viewer": "0x8888886e1d7c1468d7300cF08db89FFE68F29830",
-  "Viewer-impl": "0x053D6CAfEA290CACE8C56E26d092D76871999d50",
+  "Viewer-impl": "0xFE99ED27A2c6bE271329a1994C1f763a08B33DA5",
   "WethWorkflow": "0xC8Bb693Be58f390AC526f1822A3c7d79CbE93157",
   "WithdrawWorkflow": "0xdC70c1c6c49AC9B3cA50E2F9079843545646524a",
   "AaveLendWorkflow": "0x720E7BC50C5Db2B387463F3f58E51D4eEa4513E5",