From af38e51f1376b81ba904a59bf67715ac353bc95d Mon Sep 17 00:00:00 2001 From: Ed Zynda Date: Thu, 29 Aug 2024 17:34:48 +0300 Subject: [PATCH] Redeploy to staging and update demo script --- deployments/_deployments_log_file.json | 10 +++++----- deployments/arbitrum.staging.json | 2 +- script/demoScripts/demoPermit2Proxy.ts | 11 +++++------ 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/deployments/_deployments_log_file.json b/deployments/_deployments_log_file.json index ea7d6657d..1828bb27c 100644 --- a/deployments/_deployments_log_file.json +++ b/deployments/_deployments_log_file.json @@ -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" } ] } } } -} \ No newline at end of file +} diff --git a/deployments/arbitrum.staging.json b/deployments/arbitrum.staging.json index 4a9f4e76d..5f517619f 100644 --- a/deployments/arbitrum.staging.json +++ b/deployments/arbitrum.staging.json @@ -45,5 +45,5 @@ "HopFacetOptimized": "0xf82135385765f1324257ffF74489F16382EBBb8A", "LiFuelFeeCollector": "0x94EA56D8049e93E0308B9c7d1418Baf6A7C68280", "TokenWrapper": "0xF63b27AE2Dc887b88f82E2Cc597d07fBB2E78E70", - "Permit2Proxy": "0x442BBFD6a4641B2b710DFfa4754081eC7502a3F7" + "Permit2Proxy": "0x30252Fd1C12d240F7d63F24e54390F796F2EAF37" } \ No newline at end of file diff --git a/script/demoScripts/demoPermit2Proxy.ts b/script/demoScripts/demoPermit2Proxy.ts index 4eade89ab..67ac24b72 100644 --- a/script/demoScripts/demoPermit2Proxy.ts +++ b/script/demoScripts/demoPermit2Proxy.ts @@ -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}` @@ -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 @@ -80,7 +80,6 @@ const main = defineCommand({ abi: permit2ProxyAbi, functionName: 'getPermit2MsgHash', args: [ - DIAMOND_ADDRESS, calldata, USDT_ADDRESS, parseUnits('5', 6), @@ -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], }) }, })