Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve test coverage action [@coderabbit ignore] #790

Closed
wants to merge 40 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
e4c5947
Add Permit2Proxy
ezynda3 Aug 22, 2024
797e772
Add Permit2Proxy
ezynda3 Aug 22, 2024
48b9703
forge install: Permit2
ezynda3 Aug 22, 2024
9795b16
Get basic test working...
ezynda3 Aug 23, 2024
745c5c7
Add more basic tests
ezynda3 Aug 26, 2024
e186436
Remove superfluous receiver param
ezynda3 Aug 26, 2024
143d4c2
Add utility method for getting a valid and working msgHash to sign
ezynda3 Aug 26, 2024
779bd8b
Change name to be more specific
ezynda3 Aug 26, 2024
f36a67e
Add Permit "v1" functionality
ezynda3 Aug 26, 2024
48de477
Add Permit "v1" tests
ezynda3 Aug 26, 2024
d119ca9
Add missing comments
ezynda3 Aug 26, 2024
484c918
Flesh out demo script
ezynda3 Aug 26, 2024
f582cbc
Finish demo script
ezynda3 Aug 27, 2024
9785369
Cleanup and comments
ezynda3 Aug 27, 2024
4cd03e0
Fix log
ezynda3 Aug 27, 2024
f18dab6
Remove extra files
ezynda3 Aug 27, 2024
0eaa7c8
Remove extra remapping
ezynda3 Aug 27, 2024
a3e6f5d
Remove unneeded lib
ezynda3 Aug 27, 2024
cfd1977
Add official Permit2 addresses
ezynda3 Aug 27, 2024
db2f0ff
Merge branch 'main' into gasless-revisited
ezynda3 Aug 28, 2024
e7395b2
Allow only signer to call using EIP2612
ezynda3 Aug 29, 2024
8364ac7
Merge branch 'gasless-revisited' of github.com:lifinance/contracts in…
ezynda3 Aug 29, 2024
5d772b0
Bind Permit2Proxy to a single diamond
ezynda3 Aug 29, 2024
2f8e953
Update deploy script
ezynda3 Aug 29, 2024
3d39c31
Implement non-gasless Permit2 flow
ezynda3 Aug 29, 2024
af38e51
Redeploy to staging and update demo script
ezynda3 Aug 29, 2024
056a8c2
Update comments and remove unneeded events/errors
ezynda3 Aug 30, 2024
1755f86
Add utility methods for determining the next valid nonce
ezynda3 Aug 30, 2024
17e5da3
Redeploy and update demo script
ezynda3 Aug 30, 2024
476ba04
Add documentation
ezynda3 Aug 30, 2024
10b6204
Fixes
ezynda3 Sep 2, 2024
f5f566d
Change witness type to be consistent with the rest of the codebase
ezynda3 Sep 3, 2024
be50801
Remove unneeded whitelist
ezynda3 Sep 3, 2024
e40f49a
Merge branch 'main' of github.com:lifinance/contracts into gasless-re…
0xDEnYO Sep 6, 2024
2202a50
test
0xDEnYO Sep 6, 2024
6f86400
test
0xDEnYO Sep 6, 2024
1aa3287
test
0xDEnYO Sep 6, 2024
c75b982
test
0xDEnYO Sep 6, 2024
b27f938
test
0xDEnYO Sep 6, 2024
26fa4ea
test
0xDEnYO Sep 6, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Redeploy to staging and update demo script
  • Loading branch information
ezynda3 committed Aug 29, 2024
commit af38e51f1376b81ba904a59bf67715ac353bc95d
10 changes: 5 additions & 5 deletions deployments/_deployments_log_file.json
Original file line number Diff line number Diff line change
Expand Up @@ -22459,15 +22459,15 @@
"staging": {
"1.0.0": [
{
"ADDRESS": "0x442BBFD6a4641B2b710DFfa4754081eC7502a3F7",
"ADDRESS": "0x30252Fd1C12d240F7d63F24e54390F796F2EAF37",
"OPTIMIZER_RUNS": "1000000",
"TIMESTAMP": "2024-08-26 18:34:52",
"CONSTRUCTOR_ARGS": "0x00000000000000000000000011f1022ca6adef6400e5677528a80d49a069c00c000000000000000000000000000000000022d473030f116ddee9f6b43ac78ba3",
"TIMESTAMP": "2024-08-29 17:03:09",
"CONSTRUCTOR_ARGS": "0x000000000000000000000000d3b2b0ac0afdd0d166a495f5e9fca4ecc715a782000000000000000000000000000000000022d473030f116ddee9f6b43ac78ba3",
"SALT": "09072024",
"VERIFIED": "true"
"VERIFIED": "false"
}
]
}
}
}
}
}
2 changes: 1 addition & 1 deletion deployments/arbitrum.staging.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,5 @@
"HopFacetOptimized": "0xf82135385765f1324257ffF74489F16382EBBb8A",
"LiFuelFeeCollector": "0x94EA56D8049e93E0308B9c7d1418Baf6A7C68280",
"TokenWrapper": "0xF63b27AE2Dc887b88f82E2Cc597d07fBB2E78E70",
"Permit2Proxy": "0x442BBFD6a4641B2b710DFfa4754081eC7502a3F7"
"Permit2Proxy": "0x30252Fd1C12d240F7d63F24e54390F796F2EAF37"
}
11 changes: 5 additions & 6 deletions script/demoScripts/demoPermit2Proxy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { defineCommand, runMain } from 'citty'

const DIAMOND_ADDRESS = '0x1231DEB6f5749EF6cE6943a275A1D3E7486F4EaE'
const USDT_ADDRESS = '0xFd086bC7CD5C481DCC9C85ebE478A1C0b69FCbb9'
const PERMIT2_PROXY_ADDRESS = '0x442BBFD6a4641B2b710DFfa4754081eC7502a3F7'
const PERMIT2_PROXY_ADDRESS = '0x30252Fd1C12d240F7d63F24e54390F796F2EAF37'
const PERMIT2_ADDRESS = '0x000000000022D473030F116dDEE9F6B43aC78BA3'
const PRIVATE_KEY = `0x${process.env.PRIVATE_KEY}`

Expand Down Expand Up @@ -43,8 +43,8 @@ const main = defineCommand({
'function nonceBitmap(address owner, uint256 index) external view returns (uint256 nonce)',
])
const permit2ProxyAbi = parseAbi([
'function getPermit2MsgHash(address,bytes,address,uint256,uint256,uint256) external view returns (bytes32)',
'function callDiamondWithPermit2SignatureSingle(address,bytes,address,((address,uint256),uint256,uint256),bytes) external',
'function getPermit2MsgHash(bytes,address,uint256,uint256,uint256) external view returns (bytes32)',
'function callDiamondWithPermit2Witness(bytes,address,((address,uint256),uint256,uint256),bytes) external',
])

// Setup a READ-ONLY client
Expand Down Expand Up @@ -80,7 +80,6 @@ const main = defineCommand({
abi: permit2ProxyAbi,
functionName: 'getPermit2MsgHash',
args: [
DIAMOND_ADDRESS,
calldata,
USDT_ADDRESS,
parseUnits('5', 6),
Expand Down Expand Up @@ -111,8 +110,8 @@ const main = defineCommand({
const tx = await walletClient.writeContract({
address: PERMIT2_PROXY_ADDRESS,
abi: permit2ProxyAbi,
functionName: 'callDiamondWithPermit2SignatureSingle',
args: [DIAMOND_ADDRESS, calldata, account.address, permit, signature],
functionName: 'callDiamondWithPermit2Witness',
args: [calldata, account.address, permit, signature],
})
},
})
Expand Down
Loading