Merge pull request #15 from yearn/fp-script

yearn · Jun 28, 2024 · 3dec8a4 · 3dec8a4
2 parents aacf153 + 98465eb
commit 3dec8a4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/scripts/RegisterRollup.s.sol b/scripts/RegisterRollup.s.sol
@@ -90,7 +90,7 @@ contract RegisterRollup is BatchScript {
         require(L1_DEPLOYER.getRollupContract(rollupID) != address(0), "txn failed");
 
         console2.log("TXN posted");
-        console2.log("Visit https://app.safe.global/transactions/queue?safe=eth:", safe);
+        console2.log("Visit https://app.safe.global/transactions/queue?safe=eth:%s", safe);
         console2.log("---------------------------------------");
     }
-}
+}
diff --git a/scripts/lib/BatchScript.sol b/scripts/lib/BatchScript.sol
@@ -300,14 +300,16 @@ abstract contract BatchScript is Script, DelegatePrank {
 
     function _getNonce(address safe_) internal returns (uint256) {
         string memory endpoint = string.concat(
-            SAFE_API_BASE_URL,
-            vm.toString(safe_),
-            "/"
+            _getSafeAPIEndpoint(safe_),
+            "?limit=1"
         );
         (uint256 status, bytes memory data) = endpoint.get();
         if (status == 200) {
-            string memory result = string(data);
-            return result.readUint(".nonce");
+            string memory resp = string(data);
+            string[] memory results;
+            results = resp.readStringArray(".results");
+            if (results.length == 0) return 0;
+            return resp.readUint(".results[0].nonce") + 1;
         } else {
             revert("Get nonce failed!");
         }