feat: spender permit for AllowanceTransfer & SignatureTransfer (#1)

thaixuandang · web-flow · commit a4042c0edb3b · 2024-09-27T10:36:43.000+07:00
diff --git a/.env.example b/.env.example
@@ -1 +1,3 @@
-FORK_URL=
+FORK_URL=
+TESTNET_PK=
+MAINNET_PK=
diff --git a/.forge-snapshots/batchTransferFrom.snap b/.forge-snapshots/batchTransferFrom.snap
@@ -1 +1 @@
-61806
+63144
diff --git a/.forge-snapshots/batchTransferFromMultiToken.snap b/.forge-snapshots/batchTransferFromMultiToken.snap
@@ -1 +1 @@
-83786
+84677
diff --git a/.forge-snapshots/lockdown.snap b/.forge-snapshots/lockdown.snap
@@ -1 +1 @@
-28435
+28539
diff --git a/.forge-snapshots/permit2 + transferFrom2 with a non EIP-2612 native token.snap b/.forge-snapshots/permit2 + transferFrom2 with a non EIP-2612 native token.snap
@@ -1 +1 @@
-60711
+65544
diff --git a/.forge-snapshots/permitBatchCleanWrite.snap b/.forge-snapshots/permitBatchCleanWrite.snap
@@ -1 +1 @@
-91924
+96591
diff --git a/.forge-snapshots/permitBatchDirtyWrite.snap b/.forge-snapshots/permitBatchDirtyWrite.snap
@@ -1 +1 @@
-57724
+62391
diff --git a/.forge-snapshots/permitBatchTransferFromMultipleTokens.snap b/.forge-snapshots/permitBatchTransferFromMultipleTokens.snap
@@ -1 +1 @@
-143387
+147846
diff --git a/.forge-snapshots/permitBatchTransferFromSingleToken.snap b/.forge-snapshots/permitBatchTransferFromSingleToken.snap
@@ -1 +1 @@
-88867
+93326
diff --git a/.forge-snapshots/permitCleanWrite.snap b/.forge-snapshots/permitCleanWrite.snap
@@ -1 +1 @@
-63119
+67456
diff --git a/.forge-snapshots/permitCompactSig.snap b/.forge-snapshots/permitCompactSig.snap
@@ -1 +1 @@
-63094
+67431
diff --git a/.forge-snapshots/permitDirtyNonce.snap b/.forge-snapshots/permitDirtyNonce.snap
@@ -1 +1 @@
-44014
+48351
diff --git a/.forge-snapshots/permitDirtyWrite.snap b/.forge-snapshots/permitDirtyWrite.snap
@@ -1 +1 @@
-46019
+50356
diff --git a/.forge-snapshots/permitInvalidSigner.snap b/.forge-snapshots/permitInvalidSigner.snap
@@ -1 +1 @@
-40301
+40311
diff --git a/.forge-snapshots/permitSetMaxAllowanceCleanWrite.snap b/.forge-snapshots/permitSetMaxAllowanceCleanWrite.snap
@@ -1 +1 @@
-61114
+65451
diff --git a/.forge-snapshots/permitSetMaxAllowanceDirtyWrite.snap b/.forge-snapshots/permitSetMaxAllowanceDirtyWrite.snap
@@ -1 +1 @@
-44014
+48351
diff --git a/.forge-snapshots/permitSignatureExpired.snap b/.forge-snapshots/permitSignatureExpired.snap
@@ -1 +1 @@
-31700
+31713
diff --git a/.forge-snapshots/permitTransferFromBatchTypedWitness.snap b/.forge-snapshots/permitTransferFromBatchTypedWitness.snap
@@ -1 +1 @@
-120325
+124905
diff --git a/.forge-snapshots/permitTransferFromCompactSig.snap b/.forge-snapshots/permitTransferFromCompactSig.snap
@@ -1 +1 @@
-86066
+90447
diff --git a/.forge-snapshots/permitTransferFromSingleToken.snap b/.forge-snapshots/permitTransferFromSingleToken.snap
@@ -1 +1 @@
-86092
+90473
diff --git a/.forge-snapshots/permitTransferFromTypedWitness.snap b/.forge-snapshots/permitTransferFromTypedWitness.snap
@@ -1 +1 @@
-87817
+92204
diff --git a/.forge-snapshots/single recipient 2 tokens.snap b/.forge-snapshots/single recipient 2 tokens.snap
@@ -1 +1 @@
-118525
+122984
diff --git a/.forge-snapshots/single recipient many tokens.snap b/.forge-snapshots/single recipient many tokens.snap
@@ -1 +1 @@
-133544
+138003
diff --git a/.forge-snapshots/transferFrom with different owners.snap b/.forge-snapshots/transferFrom with different owners.snap
@@ -1 +1 @@
-61886
+62777
diff --git a/.forge-snapshots/transferFrom.snap b/.forge-snapshots/transferFrom.snap
@@ -1 +1 @@
-52197
+52605
diff --git a/.gas-snapshot b/.gas-snapshot
@@ -1,97 +1,114 @@
-AllowanceTransferInvariants:invariant_balanceEqualsSpent() (runs: 256, calls: 3840, reverts: 884)
-AllowanceTransferInvariants:invariant_permit2NeverHoldsBalance() (runs: 256, calls: 3840, reverts: 884)
-AllowanceTransferInvariants:invariant_spendNeverExceedsPermit() (runs: 256, calls: 3840, reverts: 884)
-AllowanceTransferTest:testApprove() (gas: 47561)
-AllowanceTransferTest:testBatchTransferFrom() (gas: 159268)
-AllowanceTransferTest:testBatchTransferFromDifferentOwners() (gas: 235508)
-AllowanceTransferTest:testBatchTransferFromMultiToken() (gas: 231810)
-AllowanceTransferTest:testBatchTransferFromWithGasSnapshot() (gas: 159818)
-AllowanceTransferTest:testExcessiveInvalidation() (gas: 64136)
-AllowanceTransferTest:testInvalidateMultipleNonces() (gas: 83139)
-AllowanceTransferTest:testInvalidateNonces() (gas: 62679)
-AllowanceTransferTest:testInvalidateNoncesInvalid() (gas: 16261)
-AllowanceTransferTest:testLockdown() (gas: 145952)
-AllowanceTransferTest:testLockdownEvent() (gas: 117758)
-AllowanceTransferTest:testMaxAllowance() (gas: 134993)
-AllowanceTransferTest:testMaxAllowanceDirtyWrite() (gas: 117582)
-AllowanceTransferTest:testPartialAllowance() (gas: 105067)
-AllowanceTransferTest:testReuseOrderedNonceInvalid() (gas: 69095)
-AllowanceTransferTest:testSetAllowance() (gas: 89583)
-AllowanceTransferTest:testSetAllowanceBatch() (gas: 133608)
-AllowanceTransferTest:testSetAllowanceBatchDifferentNonces() (gas: 118583)
-AllowanceTransferTest:testSetAllowanceBatchDirtyWrite() (gas: 99144)
-AllowanceTransferTest:testSetAllowanceBatchEvent() (gas: 115892)
-AllowanceTransferTest:testSetAllowanceCompactSig() (gas: 89543)
-AllowanceTransferTest:testSetAllowanceDeadlinePassed() (gas: 56500)
-AllowanceTransferTest:testSetAllowanceDirtyWrite() (gas: 72175)
-AllowanceTransferTest:testSetAllowanceIncorrectSigLength() (gas: 29157)
-AllowanceTransferTest:testSetAllowanceInvalidSignature() (gas: 64071)
-AllowanceTransferTest:testSetAllowanceTransfer() (gas: 103161)
-AllowanceTransferTest:testSetAllowanceTransferDirtyNonceDirtyTransfer() (gas: 97432)
-AllowanceTransferTest:testTransferFromWithGasSnapshot() (gas: 133004)
-AllowanceUnitTest:testPackAndUnpack(uint160,uint48,uint48) (runs: 256, μ: 38998, ~: 39076)
-AllowanceUnitTest:testUpdateAllRandomly(uint160,uint48,uint48) (runs: 256, μ: 40222, ~: 40223)
-AllowanceUnitTest:testUpdateAmountExpirationRandomly(uint160,uint48) (runs: 256, μ: 39224, ~: 39225)
+AllowanceTransferInvariants:invariant_balanceEqualsSpent() (runs: 256, calls: 3840, reverts: 2657)
+AllowanceTransferInvariants:invariant_permit2NeverHoldsBalance() (runs: 256, calls: 3840, reverts: 2657)
+AllowanceTransferInvariants:invariant_spendNeverExceedsPermit() (runs: 256, calls: 3840, reverts: 2657)
+AllowanceTransferTest:testApprove() (gas: 52107)
+AllowanceTransferTest:testApproveRevertWhenSpenderIsNotPermitted() (gas: 26440)
+AllowanceTransferTest:testBatchTransferFrom() (gas: 163778)
+AllowanceTransferTest:testBatchTransferFromDifferentOwners() (gas: 240553)
+AllowanceTransferTest:testBatchTransferFromMultiToken() (gas: 236826)
+AllowanceTransferTest:testBatchTransferFromWithGasSnapshot() (gas: 164350)
+AllowanceTransferTest:testExcessiveInvalidation() (gas: 68605)
+AllowanceTransferTest:testInvalidateMultipleNonces() (gas: 88015)
+AllowanceTransferTest:testInvalidateNonces() (gas: 67174)
+AllowanceTransferTest:testInvalidateNoncesInvalid() (gas: 16303)
+AllowanceTransferTest:testLockdown() (gas: 151097)
+AllowanceTransferTest:testLockdownEvent() (gas: 122903)
+AllowanceTransferTest:testMaxAllowance() (gas: 139525)
+AllowanceTransferTest:testMaxAllowanceDirtyWrite() (gas: 122092)
+AllowanceTransferTest:testPartialAllowance() (gas: 109621)
+AllowanceTransferTest:testReuseOrderedNonceInvalid() (gas: 73954)
+AllowanceTransferTest:testSetAllowance() (gas: 94008)
+AllowanceTransferTest:testSetAllowanceBatch() (gas: 138495)
+AllowanceTransferTest:testSetAllowanceBatchDifferentNonces() (gas: 123851)
+AllowanceTransferTest:testSetAllowanceBatchDirtyWrite() (gas: 104009)
+AllowanceTransferTest:testSetAllowanceBatchEvent() (gas: 120779)
+AllowanceTransferTest:testSetAllowanceBatchRevertWhenSpenderIsNotPermitted() (gas: 56231)
+AllowanceTransferTest:testSetAllowanceCompactSig() (gas: 93968)
+AllowanceTransferTest:testSetAllowanceDeadlinePassed() (gas: 56510)
+AllowanceTransferTest:testSetAllowanceDirtyWrite() (gas: 76600)
+AllowanceTransferTest:testSetAllowanceIncorrectSigLength() (gas: 29167)
+AllowanceTransferTest:testSetAllowanceInvalidSignature() (gas: 64081)
+AllowanceTransferTest:testSetAllowanceRevertWhenSpenderIsNotPermitted() (gas: 40105)
+AllowanceTransferTest:testSetAllowanceTransfer() (gas: 107627)
+AllowanceTransferTest:testSetAllowanceTransferDirtyNonceDirtyTransfer() (gas: 101898)
+AllowanceTransferTest:testTransferFromWithGasSnapshot() (gas: 137448)
+AllowanceUnitTest:testPackAndUnpack(uint160,uint48,uint48) (runs: 256, μ: 39099, ~: 39177)
+AllowanceUnitTest:testUpdateAllRandomly(uint160,uint48,uint48) (runs: 256, μ: 40304, ~: 40305)
+AllowanceUnitTest:testUpdateAmountExpirationRandomly(uint160,uint48) (runs: 256, μ: 39425, ~: 39426)
 CompactSignature:testCompactSignature27() (gas: 253)
 CompactSignature:testCompactSignature28() (gas: 141)
-EIP712Test:testDomainSeparator() (gas: 5804)
-EIP712Test:testDomainSeparatorAfterFork() (gas: 10787)
-NonceBitmapTest:testHighNonces() (gas: 36186)
-NonceBitmapTest:testInvalidateFullWord() (gas: 63125)
-NonceBitmapTest:testInvalidateNoncesRandomly(uint248,uint256) (runs: 256, μ: 30308, ~: 31008)
-NonceBitmapTest:testInvalidateNonzeroWord() (gas: 85665)
-NonceBitmapTest:testInvalidateTwoNoncesRandomly(uint248,uint256,uint256) (runs: 256, μ: 39187, ~: 39187)
-NonceBitmapTest:testLowNonces() (gas: 41004)
-NonceBitmapTest:testNonceWordBoundary() (gas: 42203)
-NonceBitmapTest:testUseTwoRandomNonces(uint256,uint256) (runs: 256, μ: 49120, ~: 51640)
-NonceBitmapTest:testUsingNonceTwiceFails(uint256) (runs: 256, μ: 21866, ~: 21889)
+EIP712Test:testDomainSeparator() (gas: 5805)
+EIP712Test:testDomainSeparatorAfterFork() (gas: 10790)
+MockPermit2Lib:testPermit2Code(address) (runs: 256, μ: 2912, ~: 2911)
+NonceBitmapTest:testHighNonces() (gas: 36718)
+NonceBitmapTest:testInvalidateFullWord() (gas: 63787)
+NonceBitmapTest:testInvalidateNoncesRandomly(uint248,uint256) (runs: 256, μ: 30306, ~: 31006)
+NonceBitmapTest:testInvalidateNonzeroWord() (gas: 86460)
+NonceBitmapTest:testInvalidateTwoNoncesRandomly(uint248,uint256,uint256) (runs: 256, μ: 39181, ~: 39181)
+NonceBitmapTest:testLowNonces() (gas: 41935)
+NonceBitmapTest:testNonceWordBoundary() (gas: 42628)
+NonceBitmapTest:testUseTwoRandomNonces(uint256,uint256) (runs: 256, μ: 49470, ~: 51906)
+NonceBitmapTest:testUsingNonceTwiceFails(uint256) (runs: 256, μ: 22077, ~: 22097)
 Permit2LibTest:testOZSafePermit() (gas: 24443)
 Permit2LibTest:testOZSafePermitPlusOZSafeTransferFrom() (gas: 129153)
 Permit2LibTest:testOZSafeTransferFrom() (gas: 38875)
 Permit2LibTest:testPermit2() (gas: 22737)
 Permit2LibTest:testPermit2DSLessToken() (gas: 6818)
 Permit2LibTest:testPermit2DSMore32Token() (gas: 6905)
 Permit2LibTest:testPermit2DSMoreToken() (gas: 6808)
-Permit2LibTest:testPermit2Full() (gas: 42125)
-Permit2LibTest:testPermit2InvalidAmount() (gas: 20513)
-Permit2LibTest:testPermit2LargerDS() (gas: 51128)
-Permit2LibTest:testPermit2LargerDSRevert() (gas: 32546)
-Permit2LibTest:testPermit2NonPermitToken() (gas: 31934)
+Permit2LibTest:testPermit2Full() (gas: 51907)
+Permit2LibTest:testPermit2InvalidAmount() (gas: 20689)
+Permit2LibTest:testPermit2LargerDS() (gas: 55729)
+Permit2LibTest:testPermit2LargerDSRevert() (gas: 32644)
+Permit2LibTest:testPermit2NonPermitToken() (gas: 36426)
 Permit2LibTest:testPermit2PlusTransferFrom2() (gas: 126854)
-Permit2LibTest:testPermit2PlusTransferFrom2WithNonPermit() (gas: 147888)
-Permit2LibTest:testPermit2SmallerDS() (gas: 77593)
+Permit2LibTest:testPermit2PlusTransferFrom2WithNonPermit() (gas: 152398)
+Permit2LibTest:testPermit2SmallerDS() (gas: 82194)
 Permit2LibTest:testPermit2SmallerDSNoRevert() (gas: 59230)
 Permit2LibTest:testStandardPermit() (gas: 22252)
 Permit2LibTest:testStandardTransferFrom() (gas: 38077)
 Permit2LibTest:testTransferFrom2() (gas: 38514)
-Permit2LibTest:testTransferFrom2Full() (gas: 53214)
+Permit2LibTest:testTransferFrom2Full() (gas: 53211)
 Permit2LibTest:testTransferFrom2InvalidAmount() (gas: 12666)
-Permit2LibTest:testTransferFrom2NonPermitToken() (gas: 53060)
-SignatureTransferTest:testCorrectWitnessTypehashes() (gas: 3075)
-SignatureTransferTest:testGasMultiplePermitBatchTransferFrom() (gas: 270919)
-SignatureTransferTest:testGasSinglePermitBatchTransferFrom() (gas: 186316)
-SignatureTransferTest:testGasSinglePermitTransferFrom() (gas: 123850)
-SignatureTransferTest:testInvalidateUnorderedNonces() (gas: 41268)
-SignatureTransferTest:testPermitBatchMultiPermitSingleTransfer() (gas: 133644)
-SignatureTransferTest:testPermitBatchTransferFrom() (gas: 162010)
-SignatureTransferTest:testPermitBatchTransferFromSingleRecipient() (gas: 190319)
-SignatureTransferTest:testPermitBatchTransferFromTypedWitness() (gas: 239854)
-SignatureTransferTest:testPermitBatchTransferFromTypedWitnessInvalidType() (gas: 84467)
-SignatureTransferTest:testPermitBatchTransferFromTypedWitnessInvalidTypeHash() (gas: 85864)
-SignatureTransferTest:testPermitBatchTransferFromTypedWitnessInvalidWitness() (gas: 85688)
-SignatureTransferTest:testPermitBatchTransferInvalidAmountsLengthMismatch() (gas: 43967)
-SignatureTransferTest:testPermitBatchTransferMultiAddr() (gas: 160406)
-SignatureTransferTest:testPermitBatchTransferSingleRecipientManyTokens() (gas: 211834)
-SignatureTransferTest:testPermitTransferFrom() (gas: 93012)
-SignatureTransferTest:testPermitTransferFromCompactSig() (gas: 123927)
-SignatureTransferTest:testPermitTransferFromIncorrectSigLength() (gas: 51327)
-SignatureTransferTest:testPermitTransferFromInvalidNonce() (gas: 72799)
-SignatureTransferTest:testPermitTransferFromRandomNonceAndAmount(uint256,uint128) (runs: 256, μ: 95754, ~: 96730)
-SignatureTransferTest:testPermitTransferFromToSpender() (gas: 93342)
-SignatureTransferTest:testPermitTransferFromTypedWitness() (gas: 125271)
-SignatureTransferTest:testPermitTransferFromTypedWitnessInvalidType() (gas: 55906)
-SignatureTransferTest:testPermitTransferFromTypedWitnessInvalidTypehash() (gas: 56794)
-SignatureTransferTest:testPermitTransferSpendLessThanFull(uint256,uint128) (runs: 256, μ: 97989, ~: 99707)
+Permit2LibTest:testTransferFrom2NonPermitToken() (gas: 53057)
+SignatureTransferTest:testCorrectWitnessTypehashes() (gas: 3097)
+SignatureTransferTest:testGasMultiplePermitBatchTransferFrom() (gas: 275444)
+SignatureTransferTest:testGasSinglePermitBatchTransferFrom() (gas: 188341)
+SignatureTransferTest:testGasSinglePermitTransferFrom() (gas: 128275)
+SignatureTransferTest:testInvalidateUnorderedNonces() (gas: 44838)
+SignatureTransferTest:testPermitBatchMultiPermitSingleTransfer() (gas: 138169)
+SignatureTransferTest:testPermitBatchTransferFrom() (gas: 166513)
+SignatureTransferTest:testPermitBatchTransferFromRevertWhenCallerIsNotPermittedSpender() (gas: 62987)
+SignatureTransferTest:testPermitBatchTransferFromSingleRecipient() (gas: 192366)
+SignatureTransferTest:testPermitBatchTransferFromTypedWitness() (gas: 244500)
+SignatureTransferTest:testPermitBatchTransferFromTypedWitnessInvalidType() (gas: 89113)
+SignatureTransferTest:testPermitBatchTransferFromTypedWitnessInvalidTypeHash() (gas: 90532)
+SignatureTransferTest:testPermitBatchTransferFromTypedWitnessInvalidWitness() (gas: 90356)
+SignatureTransferTest:testPermitBatchTransferFromTypedWitnessRevertWhenCallerIsNotPermittedSpender() (gas: 65288)
+SignatureTransferTest:testPermitBatchTransferInvalidAmountsLengthMismatch() (gas: 46023)
+SignatureTransferTest:testPermitBatchTransferMultiAddr() (gas: 164931)
+SignatureTransferTest:testPermitBatchTransferSingleRecipientManyTokens() (gas: 213859)
+SignatureTransferTest:testPermitTransferFrom() (gas: 97415)
+SignatureTransferTest:testPermitTransferFromCompactSig() (gas: 128352)
+SignatureTransferTest:testPermitTransferFromIncorrectSigLength() (gas: 55746)
+SignatureTransferTest:testPermitTransferFromInvalidNonce() (gas: 77621)
+SignatureTransferTest:testPermitTransferFromRandomNonceAndAmount(uint256,uint128) (runs: 256, μ: 99824, ~: 101155)
+SignatureTransferTest:testPermitTransferFromRevertWhenCallerIsNotPermittedSpender() (gas: 41694)
+SignatureTransferTest:testPermitTransferFromToSpender() (gas: 97767)
+SignatureTransferTest:testPermitTransferFromTypedWitness() (gas: 129643)
+SignatureTransferTest:testPermitTransferFromTypedWitnessInvalidType() (gas: 60316)
+SignatureTransferTest:testPermitTransferFromTypedWitnessInvalidTypehash() (gas: 61204)
+SignatureTransferTest:testPermitTransferFromTypedWitnessRevertWhenCallerIsNotPermittedSpender() (gas: 35471)
+SignatureTransferTest:testPermitTransferSpendLessThanFull(uint256,uint128) (runs: 256, μ: 102137, ~: 104132)
+SpenderPermitTest:test_areAllSpendersAllowed() (gas: 32953)
+SpenderPermitTest:test_permitSpender() (gas: 37685)
+SpenderPermitTest:test_permitSpender_RevertIfCallerIsNotOwner() (gas: 15611)
+SpenderPermitTest:test_isSpender() (gas: 40600)
+SpenderPermitTest:test_isSpender_WhenAllSpendersAllowed() (gas: 35518)
+SpenderPermitTest:test_renounceOwnership() (gas: 38913)
+SpenderPermitTest:test_renounceOwnership_RevertIfCallerIsNotOwner() (gas: 16773)
+SpenderPermitTest:test_revokeSpender() (gas: 28317)
+SpenderPermitTest:test_revokeSpender_RevertIfCallerIsNotOwner() (gas: 15919)
 TypehashGeneration:testPermitBatch() (gas: 40493)
 TypehashGeneration:testPermitBatchTransferFrom() (gas: 49854)
 TypehashGeneration:testPermitBatchTransferFromWithWitness() (gas: 56587)
@@ -101,5 +118,4 @@ TypehashGeneration:testPermitSingle() (gas: 28117)
 TypehashGeneration:testPermitTransferFrom() (gas: 36520)
 TypehashGeneration:testPermitTransferFromWithWitness() (gas: 43369)
 TypehashGeneration:testPermitTransferFromWithWitnessIncorrectPermitData() (gas: 43430)
-TypehashGeneration:testPermitTransferFromWithWitnessIncorrectTypehashStub() (gas: 43833)
-MockPermit2Lib:testPermit2Code(address):(bool) (runs: 256, μ: 2911, ~: 2911)
+TypehashGeneration:testPermitTransferFromWithWitnessIncorrectTypehashStub() (gas: 43833)
diff --git a/Makefile b/Makefile
@@ -0,0 +1,15 @@
+deploy-testnet:
+	op run --env-file="./.env" -- \
+  bash -c 'echo $$TESTNET_PK | xargs -I {} forge script DeployPermit2 --private-key {} -f ronin-testnet'
+
+deploy-testnet-broadcast:
+	op run --env-file="./.env" -- \
+  bash -c 'echo $$TESTNET_PK | xargs -I {} forge script DeployPermit2 --private-key {} -f ronin-testnet --verify --verifier sourcify --verifier-url https://sourcify.roninchain.com/server/ --legacy --broadcast'
+
+deploy-mainnet:
+	op run --env-file="./.env" -- \
+	bash -c 'echo $$MAINNET_PK | xargs -I {} forge script DeployPermit2 --private-key {} -f ronin-mainnet'
+
+deploy-mainnet-broadcast:
+	op run --env-file="./.env" -- \
+	bash -c 'echo $$MAINNET_PK | xargs -I {} forge script DeployPermit2 --private-key {} -f ronin-mainnet --legacy --broadcast'
diff --git a/foundry.toml b/foundry.toml
@@ -1,6 +1,5 @@
 [profile.default]
 solc = "0.8.17"
-bytecode_hash = "none"
 optimizer = true
 via_ir = true
 optimizer_runs = 1000000
@@ -12,3 +11,11 @@ fs_permissions = [{ access = "read-write", path = ".forge-snapshots/"}]
 [profile.integration]
 no_match_path = ""
 match_path = "*/integration/*"
+
+
+[rpc_endpoints]
+localhost = "http://localhost:8545"
+ethereum = "https://eth.llamarpc.com"
+ronin-mainnet = "https://api.roninchain.com/rpc"
+goerli = "https://ethereum-goerli.publicnode.com"
+ronin-testnet = "https://saigon-archive.roninchain.com/rpc"
diff --git a/script/DeployPermit2.s.sol b/script/DeployPermit2.s.sol
@@ -5,17 +5,12 @@ import "forge-std/console2.sol";
 import "forge-std/Script.sol";
 import {Permit2} from "src/Permit2.sol";
 
-bytes32 constant SALT = bytes32(uint256(0x0000000000000000000000000000000000000000d3af2663da51c10215000000));
-
 contract DeployPermit2 is Script {
     function setUp() public {}
 
     function run() public returns (Permit2 permit2) {
-        vm.startBroadcast();
-
-        permit2 = new Permit2{salt: SALT}();
+        vm.broadcast();
+        permit2 = new Permit2();
         console2.log("Permit2 Deployed:", address(permit2));
-
-        vm.stopBroadcast();
     }
 }
diff --git a/src/AllowanceTransfer.sol b/src/AllowanceTransfer.sol
diff --git a/src/SignatureTransfer.sol b/src/SignatureTransfer.sol
diff --git a/src/SpenderPermit.sol b/src/SpenderPermit.sol
diff --git a/src/interfaces/ISpenderPermit.sol b/src/interfaces/ISpenderPermit.sol
diff --git a/test/AllowanceTransferTest.t.sol b/test/AllowanceTransferTest.t.sol
diff --git a/test/Permit2Lib.t.sol b/test/Permit2Lib.t.sol
diff --git a/test/SignatureTransfer.t.sol b/test/SignatureTransfer.t.sol
diff --git a/test/SpenderPermit.t.sol b/test/SpenderPermit.t.sol
