Merge branch 'main' into dependabot/github_actions/romeovs/lcov-repor…

…ter-action-87a815f34ec27a5826abba44ce09bbc688da58fd

.gas-snapshot

@@ -1,41 +1,44 @@
 BlacklistableV1Test:testBlacklist() (gas: 29965)
 BlacklistableV1Test:testUnBlacklist() (gas: 21520)
-FiatTokenV1Test:testApprove() (gas: 46042)
+FiatTokenV1Test:testAddTrustedAddress() (gas: 45693)
+FiatTokenV1Test:testApprove() (gas: 46087)
 FiatTokenV1Test:testBalanceOf() (gas: 79378)
-FiatTokenV1Test:testBlacklist() (gas: 120350)
-FiatTokenV1Test:testBlacklistUnauthorized() (gas: 26340)
+FiatTokenV1Test:testBlacklist() (gas: 120306)
+FiatTokenV1Test:testBlacklistUnauthorized() (gas: 26274)
 FiatTokenV1Test:testBurn() (gas: 65394)
 FiatTokenV1Test:testBurnFrom() (gas: 90684)
-FiatTokenV1Test:testBurnMustBeLessThanBalance() (gas: 82723)
+FiatTokenV1Test:testBurnMustBeLessThanBalance() (gas: 82767)
 FiatTokenV1Test:testBurnUnauthorized() (gas: 88742)
-FiatTokenV1Test:testDecimals() (gas: 10484)
+FiatTokenV1Test:testDecimals() (gas: 10528)
 FiatTokenV1Test:testGetRoleAdmin() (gas: 14941)
 FiatTokenV1Test:testGrantRole() (gas: 51998)
-FiatTokenV1Test:testGrantRoleUnauthorized() (gas: 29762)
-FiatTokenV1Test:testHasRole() (gas: 22177)
-FiatTokenV1Test:testInitializedRoles() (gas: 50876)
-FiatTokenV1Test:testMint() (gas: 80183)
-FiatTokenV1Test:testMintAboveCap() (gas: 80662)
-FiatTokenV1Test:testMintUnauthorized() (gas: 25972)
-FiatTokenV1Test:testName() (gas: 17360)
+FiatTokenV1Test:testGrantRoleUnauthorized() (gas: 29718)
+FiatTokenV1Test:testHasRole() (gas: 22155)
+FiatTokenV1Test:testInitializedRoles() (gas: 50788)
+FiatTokenV1Test:testIsTrustedAddress() (gas: 20707)
+FiatTokenV1Test:testMint() (gas: 80227)
+FiatTokenV1Test:testMintAboveCap() (gas: 80728)
+FiatTokenV1Test:testMintUnauthorized() (gas: 25905)
+FiatTokenV1Test:testName() (gas: 17382)
 FiatTokenV1Test:testPause() (gas: 77131)
-FiatTokenV1Test:testPauseUnauthorized() (gas: 23679)
-FiatTokenV1Test:testPaused() (gas: 44168)
-FiatTokenV1Test:testRenounceRole() (gas: 23403)
-FiatTokenV1Test:testRescue() (gas: 524538)
-FiatTokenV1Test:testRevokeRole() (gas: 29992)
-FiatTokenV1Test:testRevokeRoleUnauthorized() (gas: 29799)
-FiatTokenV1Test:testSymbol() (gas: 17349)
-FiatTokenV1Test:testTotalSupply() (gas: 78430)
-FiatTokenV1Test:testTransfer() (gas: 93502)
-FiatTokenV1Test:testTransferCannotBeToZeroAddress() (gas: 81173)
-FiatTokenV1Test:testTransferFrom() (gas: 108500)
-FiatTokenV1Test:testTransferMustBeAtLeaseBalance() (gas: 86654)
-FiatTokenV1Test:testUnauthorizedInitialization() (gas: 2417616)
-FiatTokenV1Test:testUnblacklist() (gas: 118105)
-FiatTokenV1Test:testUnblacklistUnauthorized() (gas: 55808)
-FiatTokenV1Test:testUnpause() (gas: 35192)
-FiatTokenV1Test:testUnpauseUnauthorized() (gas: 52663)
-FiatTokenV1Test:testUpgradeToAndCall() (gas: 2286978)
-FiatTokenV1Test:testVersion() (gas: 12001)
+FiatTokenV1Test:testPauseUnauthorized() (gas: 23768)
+FiatTokenV1Test:testPaused() (gas: 44190)
+FiatTokenV1Test:testRemoveTrustedAddress() (gas: 23721)
+FiatTokenV1Test:testRenounceRole() (gas: 23337)
+FiatTokenV1Test:testRescue() (gas: 524582)
+FiatTokenV1Test:testRevokeRole() (gas: 29926)
+FiatTokenV1Test:testRevokeRoleUnauthorized() (gas: 29755)
+FiatTokenV1Test:testSymbol() (gas: 17371)
+FiatTokenV1Test:testTotalSupply() (gas: 78496)
+FiatTokenV1Test:testTransfer() (gas: 93568)
+FiatTokenV1Test:testTransferCannotBeToZeroAddress() (gas: 81217)
+FiatTokenV1Test:testTransferFrom() (gas: 108517)
+FiatTokenV1Test:testTransferMustBeAtLeaseBalance() (gas: 86720)
+FiatTokenV1Test:testUnauthorizedInitialization() (gas: 2467001)
+FiatTokenV1Test:testUnblacklist() (gas: 117964)
+FiatTokenV1Test:testUnblacklistUnauthorized() (gas: 55587)
+FiatTokenV1Test:testUnpause() (gas: 35210)
+FiatTokenV1Test:testUnpauseUnauthorized() (gas: 52752)
+FiatTokenV1Test:testUpgradeToAndCall() (gas: 2336296)
+FiatTokenV1Test:testVersion() (gas: 11934)
 RescuableV1Test:testRescue() (gas: 42236)

README.md

@@ -151,7 +151,7 @@ forge script script/DeployFiatToken.s.sol:DeployFiatToken --rpc-url $SEPOLIA_RPC
 To deploy with hardware wallet:
 
 ```shell
-forge script script/DeployFiatToken.s.sol:DeployFiatToken --rpc-url $SEPOLIA_RPC_URL --ledger --hd-paths $DERIVATION_PATH --sender $HARDWARE_WALLET_ADDRESS --broadcast --verify --ffi -vvvv
+forge script script/DeployFiatToken.s.sol:DeployFiatToken --rpc-url $SEPOLIA_RPC_URL --ledger --sender $HARDWARE_WALLET_ADDRESS --broadcast --verify --ffi -vvvv
 ```
 
 ## Upgrading a Contract

src/v1/FiatTokenV1.sol

@@ -126,7 +126,11 @@ contract FiatTokenV1 is
     }
 
     function version() public pure virtual returns (string memory) {
-        return "v1";
+        return "1";
+    }
+
+    function decimals() public pure virtual override returns (uint8) {
+        return 6;
     }
 
     function _authorizeUpgrade(address newImplementation) internal override onlyRole(UPGRADER_ROLE) {}

test/v1/FiatTokenV1.t.sol

@@ -22,7 +22,7 @@ import {Ramen} from "../../src/mocks/Ramen.sol";
 contract FiatTokenV99 is FiatTokenV1 {
     // solhint-disable-next-line foundry-test-functions
     function version() public pure virtual override(FiatTokenV1) returns (string memory) {
-        return "v99";
+        return "99";
     }
 }
 
@@ -99,7 +99,7 @@ contract FiatTokenV1Test is Test {
     // ERC 20 behavior
 
     function testVersion() public {
-        assertEq(fiatTokenV1.version(), "v1");
+        assertEq(fiatTokenV1.version(), "1");
     }
 
     function testName() public {
@@ -111,7 +111,7 @@ contract FiatTokenV1Test is Test {
     }
 
     function testDecimals() public {
-        assertEq(fiatTokenV1.decimals(), 18);
+        assertEq(fiatTokenV1.decimals(), 6);
     }
 
     function testBalanceOf() public {
@@ -504,16 +504,16 @@ contract FiatTokenV1Test is Test {
         // new implementation contract
         FiatTokenV99 fiatTokenV99 = new FiatTokenV99();
         address newImplementationAddress = address(fiatTokenV99);
-        assertEq(fiatTokenV99.version(), "v99");
-        assertEq(fiatTokenV1.version(), "v1");
+        assertEq(fiatTokenV99.version(), "99");
+        assertEq(fiatTokenV1.version(), "1");
         // upgrade contract
         vm.prank(upgrader);
         fiatTokenV1.upgradeToAndCall(newImplementationAddress, "");
         address updatedImplementationAddress = Upgrades.getImplementationAddress(address(proxy));
         // verify implementation address is updated
         assertEq(newImplementationAddress, updatedImplementationAddress);
         // verify version() function implementation is updated
-        assertEq(fiatTokenV1.version(), "v99");
+        assertEq(fiatTokenV1.version(), "99");
     }
 
     // Trusted addresses