From 7aafee675e983e7bcb63bec7bf13656fccceee04 Mon Sep 17 00:00:00 2001 From: Michael Kim Date: Fri, 10 May 2024 17:02:54 +0900 Subject: [PATCH] Upgrade npm modules loyalty-tokens, multisig-wallet-contracts --- .../contracts/contracts/bridge/Bridge.sol | 12 ++++-- .../contracts/interfaces/IBridge.sol | 1 + .../contracts/interfaces/IBridgeLiquidity.sol | 7 +++- packages/contracts/package.json | 4 +- packages/contracts/src/utils/ContractUtils.ts | 9 +++-- packages/contracts/test/01-Bridge.test.ts | 25 ++++++++----- packages/validator/package.json | 6 +-- packages/validator/src/utils/ContractUtils.ts | 8 ++-- packages/validator/test-local/localtest.ts | 27 +++++++++----- packages/validator/test/01-Collector.test.ts | 23 +++++++----- packages/validator/test/02-Bridge.test.ts | 37 +++++++++++-------- yarn.lock | 16 ++++---- 12 files changed, 110 insertions(+), 65 deletions(-) diff --git a/packages/contracts/contracts/bridge/Bridge.sol b/packages/contracts/contracts/bridge/Bridge.sol index a50f72d..10db291 100644 --- a/packages/contracts/contracts/bridge/Bridge.sol +++ b/packages/contracts/contracts/bridge/Bridge.sol @@ -98,6 +98,7 @@ contract Bridge is BridgeStorage, Initializable, OwnableUpgradeable, UUPSUpgrade bytes32 _depositId, address _account, uint256 _amount, + uint256 _expiry, bytes calldata _signature ) external payable override notExistDeposit(_depositId) { require(tokenInfos[_tokenId].status == TokenStatus.Registered, "1713"); @@ -111,7 +112,7 @@ contract Bridge is BridgeStorage, Initializable, OwnableUpgradeable, UUPSUpgrade require(_amount > tokenInfos[_tokenId].fee * 2, "1031"); BIP20DelegatedTransfer token = tokenInfos[_tokenId].token; - if (token.delegatedTransfer(_account, address(this), _amount, _signature)) { + if (token.delegatedTransfer(_account, address(this), _amount, _expiry, _signature)) { DepositData memory data = DepositData({ tokenId: _tokenId, account: _account, amount: _amount }); deposits[_depositId] = data; emit BridgeDeposited(_tokenId, _depositId, data.account, data.amount, 0); @@ -264,7 +265,12 @@ contract Bridge is BridgeStorage, Initializable, OwnableUpgradeable, UUPSUpgrade } /// @notice 브리지를 위한 유동성 자금을 예치합니다. - function depositLiquidity(bytes32 _tokenId, uint256 _amount, bytes calldata _signature) external payable override { + function depositLiquidity( + bytes32 _tokenId, + uint256 _amount, + uint256 _expiry, + bytes calldata _signature + ) external payable override { require(tokenInfos[_tokenId].status == TokenStatus.Registered, "1713"); if (tokenInfos[_tokenId].native) { @@ -277,7 +283,7 @@ contract Bridge is BridgeStorage, Initializable, OwnableUpgradeable, UUPSUpgrade require(token.balanceOf(_msgSender()) >= _amount, "1511"); require(_amount % 1 gwei == 0, "1030"); - if (token.delegatedTransfer(_msgSender(), address(this), _amount, _signature)) { + if (token.delegatedTransfer(_msgSender(), address(this), _amount, _expiry, _signature)) { liquidity[_tokenId][_msgSender()] += _amount; emit DepositedLiquidity(_tokenId, _msgSender(), _amount, liquidity[_tokenId][_msgSender()]); } diff --git a/packages/contracts/contracts/interfaces/IBridge.sol b/packages/contracts/contracts/interfaces/IBridge.sol index a950ca8..8bb257c 100644 --- a/packages/contracts/contracts/interfaces/IBridge.sol +++ b/packages/contracts/contracts/interfaces/IBridge.sol @@ -28,6 +28,7 @@ interface IBridge { bytes32 _depositId, address _account, uint256 _amount, + uint256 _expiry, bytes calldata _signature ) external payable; diff --git a/packages/contracts/contracts/interfaces/IBridgeLiquidity.sol b/packages/contracts/contracts/interfaces/IBridgeLiquidity.sol index abf08bd..e884aab 100644 --- a/packages/contracts/contracts/interfaces/IBridgeLiquidity.sol +++ b/packages/contracts/contracts/interfaces/IBridgeLiquidity.sol @@ -6,7 +6,12 @@ interface IBridgeLiquidity { event DepositedLiquidity(bytes32 tokenId, address account, uint256 amount, uint256 liquidity); event WithdrawnLiquidity(bytes32 tokenId, address account, uint256 amount, uint256 liquidity); - function depositLiquidity(bytes32 _tokenId, uint256 _amount, bytes calldata _signature) external payable; + function depositLiquidity( + bytes32 _tokenId, + uint256 _amount, + uint256 _expiry, + bytes calldata _signature + ) external payable; function withdrawLiquidity(bytes32 _tokenId, uint256 _amount) external; diff --git a/packages/contracts/package.json b/packages/contracts/package.json index b3e9e3e..20eaa71 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -1,6 +1,6 @@ { "name": "dms-bridge-contracts", - "version": "1.5.0", + "version": "1.6.0", "description": "Smart Contracts of DMS Bridge", "files": [ "**/*.sol" @@ -46,7 +46,7 @@ "ethers": "^5.7.0", "hardhat": "^2.12.7", "hardhat-gas-reporter": "^1.0.7", - "loyalty-tokens": "^1.1.0", + "loyalty-tokens": "^1.1.2", "mocha": "10.1.0", "prettier": "^2.5.1", "prettier-plugin-solidity": "^1.1.1", diff --git a/packages/contracts/src/utils/ContractUtils.ts b/packages/contracts/src/utils/ContractUtils.ts index 68c4420..4d06bf5 100644 --- a/packages/contracts/src/utils/ContractUtils.ts +++ b/packages/contracts/src/utils/ContractUtils.ts @@ -103,18 +103,21 @@ export class ContractUtils { } public static getTransferMessage( + chainId: BigNumberish, + tokenAddress: string, from: string, to: string, amount: BigNumberish, nonce: BigNumberish, - chainId?: BigNumberish + expiry: number ): Uint8Array { const encodedResult = defaultAbiCoder.encode( - ["address", "address", "uint256", "uint256", "uint256"], - [from, to, amount, chainId ? chainId : hre.ethers.provider.network.chainId, nonce] + ["uint256", "address", "address", "address", "uint256", "uint256", "uint256"], + [chainId, tokenAddress, from, to, amount, nonce, expiry] ); return arrayify(keccak256(encodedResult)); } + public static async signMessage(signer: Signer, message: Uint8Array): Promise { return signer.signMessage(message); } diff --git a/packages/contracts/test/01-Bridge.test.ts b/packages/contracts/test/01-Bridge.test.ts index 71f51c2..e876ac0 100644 --- a/packages/contracts/test/01-Bridge.test.ts +++ b/packages/contracts/test/01-Bridge.test.ts @@ -62,7 +62,7 @@ describe("Test for Ledger", () => { const signature = await ContractUtils.signMessage(deployments.accounts.deployer, arrayify(HashZero)); const tx1 = await bridgeContract .connect(deployments.accounts.deployer) - .depositLiquidity(tokenId0, liquidityAmount, signature, { value: liquidityAmount }); + .depositLiquidity(tokenId0, liquidityAmount, 0, signature, { value: liquidityAmount }); console.log(`Deposit liquidity native token (tx: ${tx1.hash})...`); await tx1.wait(); @@ -71,19 +71,22 @@ describe("Test for Ledger", () => { it("Deposit BIP20 Liquidity", async () => { const liquidityAmount = Amount.make(1_000_000_000, 18).value; - const nonce = await (deployments.getContract("TestLYT") as BIP20DelegatedTransfer).nonceOf( - deployments.accounts.deployer.address - ); + const token = deployments.getContract("TestLYT") as BIP20DelegatedTransfer; + const nonce = await token.nonceOf(deployments.accounts.deployer.address); + const expiry = ContractUtils.getTimeStamp() + 12 * 5; const message = ContractUtils.getTransferMessage( + hre.ethers.provider.network.chainId, + token.address, deployments.accounts.deployer.address, bridgeContract.address, liquidityAmount, - nonce + nonce, + expiry ); const signature = await ContractUtils.signMessage(deployments.accounts.deployer, message); const tx1 = await bridgeContract .connect(deployments.accounts.deployer) - .depositLiquidity(tokenId1, liquidityAmount, signature); + .depositLiquidity(tokenId1, liquidityAmount, expiry, signature); console.log(`Deposit liquidity token (tx: ${tx1.hash})...`); await tx1.wait(); @@ -97,7 +100,7 @@ describe("Test for Ledger", () => { await expect( bridgeContract .connect(deployments.accounts.users[0]) - .depositToBridge(tokenId0, depositId, AddressZero, 0, signature, { + .depositToBridge(tokenId0, depositId, AddressZero, 0, 0, signature, { value: amount, }) ) @@ -145,18 +148,22 @@ describe("Test for Ledger", () => { const oldLiquidity = await tokenContract.balanceOf(bridgeContract.address); const oldTokenBalance = await tokenContract.balanceOf(deployments.accounts.users[0].address); const nonce = await tokenContract.nonceOf(deployments.accounts.users[0].address); + const expiry = ContractUtils.getTimeStamp() + 12 * 5; const message = ContractUtils.getTransferMessage( + hre.ethers.provider.network.chainId, + tokenContract.address, deployments.accounts.users[0].address, bridgeContract.address, amount, - nonce + nonce, + expiry ); depositId = ContractUtils.getRandomId(deployments.accounts.users[0].address); const signature = await ContractUtils.signMessage(deployments.accounts.users[0], message); await expect( bridgeContract .connect(deployments.accounts.deployer) - .depositToBridge(tokenId1, depositId, deployments.accounts.users[0].address, amount, signature) + .depositToBridge(tokenId1, depositId, deployments.accounts.users[0].address, amount, expiry, signature) ) .to.emit(bridgeContract, "BridgeDeposited") .withNamedArgs({ diff --git a/packages/validator/package.json b/packages/validator/package.json index 1e7650a..b9197e5 100644 --- a/packages/validator/package.json +++ b/packages/validator/package.json @@ -69,7 +69,7 @@ "chai": "^4.3.7", "chai-http": "^4.3.7", "cors": "^2.8.5", - "dms-bridge-contracts": "^1.5.0", + "dms-bridge-contracts": "^1.6.0", "dom-parser": "^1.1.5", "dotenv": "^10.0.0", "ethereum-waffle": "^4.0.10", @@ -82,8 +82,8 @@ "hardhat": "^2.12.7", "hardhat-gas-reporter": "^1.0.7", "ip": "^1.1.5", - "loyalty-tokens": "^1.1.0", - "multisig-wallet-contracts": "^1.1.0", + "loyalty-tokens": "^1.1.2", + "multisig-wallet-contracts": "^1.1.3", "mybatis-mapper": "^0.7.1", "node-cron": "^3.0.0", "pg": "^8.11.3", diff --git a/packages/validator/src/utils/ContractUtils.ts b/packages/validator/src/utils/ContractUtils.ts index 812ab6c..c0bd8bc 100644 --- a/packages/validator/src/utils/ContractUtils.ts +++ b/packages/validator/src/utils/ContractUtils.ts @@ -616,15 +616,17 @@ export class ContractUtils { } public static getTransferMessage( + chainId: BigNumberish, + tokenAddress: string, from: string, to: string, amount: BigNumberish, nonce: BigNumberish, - chainId: BigNumberish + expiry: number ): Uint8Array { const encodedResult = defaultAbiCoder.encode( - ["address", "address", "uint256", "uint256", "uint256"], - [from, to, amount, chainId, nonce] + ["uint256", "address", "address", "address", "uint256", "uint256", "uint256"], + [chainId, tokenAddress, from, to, amount, nonce, expiry] ); return arrayify(keccak256(encodedResult)); } diff --git a/packages/validator/test-local/localtest.ts b/packages/validator/test-local/localtest.ts index 086ccd1..552bf6e 100644 --- a/packages/validator/test-local/localtest.ts +++ b/packages/validator/test-local/localtest.ts @@ -99,7 +99,7 @@ describe("Test for Bridge", function () { const signature = await ContractUtils.signMessage(deploymentsA.accounts.deployer, arrayify(HashZero)); const tx1 = await bridgeAContract .connect(deploymentsA.accounts.deployer) - .depositLiquidity(tokenId0, liquidityAmount, signature, { value: liquidityAmount }); + .depositLiquidity(tokenId0, liquidityAmount, 0, signature, { value: liquidityAmount }); await tx1.wait(); }); @@ -109,7 +109,7 @@ describe("Test for Bridge", function () { const signature = await ContractUtils.signMessage(deploymentsB.accounts.deployer, arrayify(HashZero)); const tx1 = await bridgeBContract .connect(deploymentsB.accounts.deployer) - .depositLiquidity(tokenId0, liquidityAmount, signature, { value: liquidityAmount }); + .depositLiquidity(tokenId0, liquidityAmount, 0, signature, { value: liquidityAmount }); await tx1.wait(); }); @@ -117,17 +117,20 @@ describe("Test for Bridge", function () { await hre.changeNetwork(config.bridge.networkAName); const liquidityAmount = Amount.make(1_000_000_000, 18).value; const nonce = await tokenAContract.nonceOf(deploymentsA.accounts.deployer.address); + const expiry = ContractUtils.getTimeStamp() + 60; const message = ContractUtils.getTransferMessage( + hre.getChainId(config.bridge.networkAName), + tokenAContract.address, deploymentsA.accounts.deployer.address, bridgeAContract.address, liquidityAmount, nonce, - hre.getChainId(config.bridge.networkAName) + expiry ); const signature = await ContractUtils.signMessage(deploymentsA.accounts.deployer, message); const tx1 = await bridgeAContract .connect(deploymentsA.accounts.deployer) - .depositLiquidity(tokenId1, liquidityAmount, signature); + .depositLiquidity(tokenId1, liquidityAmount, expiry, signature); await tx1.wait(); }); @@ -135,17 +138,20 @@ describe("Test for Bridge", function () { await hre.changeNetwork(config.bridge.networkBName); const liquidityAmount = Amount.make(1_000_000_000, 18).value; const nonce = await tokenBContract.nonceOf(deploymentsB.accounts.deployer.address); + const expiry = ContractUtils.getTimeStamp() + 60; const message = ContractUtils.getTransferMessage( + hre.getChainId(config.bridge.networkBName), + tokenBContract.address, deploymentsB.accounts.deployer.address, bridgeBContract.address, liquidityAmount, nonce, - hre.getChainId(config.bridge.networkBName) + expiry ); const signature = await ContractUtils.signMessage(deploymentsB.accounts.deployer, message); const tx1 = await bridgeBContract .connect(deploymentsB.accounts.deployer) - .depositLiquidity(tokenId1, liquidityAmount, signature); + .depositLiquidity(tokenId1, liquidityAmount, expiry, signature); await tx1.wait(); }); @@ -160,7 +166,7 @@ describe("Test for Bridge", function () { const signature = await ContractUtils.signMessage(deploymentsA.accounts.users[0], arrayify(HashZero)); const tx = await bridgeAContract .connect(deploymentsA.accounts.users[0]) - .depositToBridge(tokenId0, depositId, AddressZero, 0, signature, { + .depositToBridge(tokenId0, depositId, AddressZero, 0, 0, signature, { value: amount, }); await tx.wait(); @@ -183,18 +189,21 @@ describe("Test for Bridge", function () { const oldLiquidity = await tokenBContract.balanceOf(bridgeBContract.address); const oldTokenBalance = await tokenBContract.balanceOf(deploymentsB.accounts.users[0].address); const nonce = await tokenBContract.nonceOf(deploymentsB.accounts.users[0].address); + const expiry = ContractUtils.getTimeStamp() + 60; const message = ContractUtils.getTransferMessage( + hre.getChainId(config.bridge.networkBName), + tokenBContract.address, deploymentsB.accounts.users[0].address, bridgeBContract.address, amount, nonce, - hre.getChainId(config.bridge.networkBName) + expiry ); depositId = ContractUtils.getRandomId(deploymentsB.accounts.users[0].address); const signature = await ContractUtils.signMessage(deploymentsB.accounts.users[0], message); const tx = await bridgeBContract .connect(deploymentsB.accounts.deployer) - .depositToBridge(tokenId1, depositId, deploymentsB.accounts.users[0].address, amount, signature); + .depositToBridge(tokenId1, depositId, deploymentsB.accounts.users[0].address, amount, expiry, signature); await tx.wait(); expect(await tokenBContract.balanceOf(deploymentsB.accounts.users[0].address)).to.deep.equal( diff --git a/packages/validator/test/01-Collector.test.ts b/packages/validator/test/01-Collector.test.ts index 3a8d132..0408791 100644 --- a/packages/validator/test/01-Collector.test.ts +++ b/packages/validator/test/01-Collector.test.ts @@ -113,27 +113,29 @@ describe("Test for EventCollector", () => { const signature = await ContractUtils.signMessage(deploymentsA.accounts.deployer, arrayify(HashZero)); const tx1 = await bridgeContract .connect(deploymentsA.accounts.deployer) - .depositLiquidity(tokenId0, liquidityAmount, signature, { value: liquidityAmount }); + .depositLiquidity(tokenId0, liquidityAmount, 0, signature, { value: liquidityAmount }); await tx1.wait(); }); it("Deposit BIP20 Liquidity", async () => { await hre.changeNetwork(config.bridge.networkAName); const liquidityAmount = Amount.make(1_000_000_000, 18).value; - const nonce = await (deploymentsA.getContract("TestLYT") as BIP20DelegatedTransfer).nonceOf( - deploymentsA.accounts.deployer.address - ); + const token = deploymentsA.getContract("TestLYT") as BIP20DelegatedTransfer; + const nonce = await token.nonceOf(deploymentsA.accounts.deployer.address); + const expiry = ContractUtils.getTimeStamp() + 60; const message = ContractUtils.getTransferMessage( + hre.getChainId(config.bridge.networkAName), + token.address, deploymentsA.accounts.deployer.address, bridgeContract.address, liquidityAmount, nonce, - hre.getChainId(config.bridge.networkAName) + expiry ); const signature = await ContractUtils.signMessage(deploymentsA.accounts.deployer, message); const tx1 = await bridgeContract .connect(deploymentsA.accounts.deployer) - .depositLiquidity(tokenId1, liquidityAmount, signature); + .depositLiquidity(tokenId1, liquidityAmount, expiry, signature); await tx1.wait(); }); @@ -145,7 +147,7 @@ describe("Test for EventCollector", () => { await expect( bridgeContract .connect(deploymentsA.accounts.users[0]) - .depositToBridge(tokenId0, depositId, AddressZero, 0, signature, { + .depositToBridge(tokenId0, depositId, AddressZero, 0, 0, signature, { value: amount, }) ) @@ -180,19 +182,22 @@ describe("Test for EventCollector", () => { const oldLiquidity = await tokenContract.balanceOf(bridgeContract.address); const oldTokenBalance = await tokenContract.balanceOf(deploymentsA.accounts.users[0].address); const nonce = await tokenContract.nonceOf(deploymentsA.accounts.users[0].address); + const expiry = ContractUtils.getTimeStamp() + 60; const message = ContractUtils.getTransferMessage( + hre.getChainId(config.bridge.networkAName), + tokenContract.address, deploymentsA.accounts.users[0].address, bridgeContract.address, amount, nonce, - hre.getChainId(config.bridge.networkAName) + expiry ); depositId = ContractUtils.getRandomId(deploymentsA.accounts.users[0].address); const signature = await ContractUtils.signMessage(deploymentsA.accounts.users[0], message); await expect( bridgeContract .connect(deploymentsA.accounts.deployer) - .depositToBridge(tokenId1, depositId, deploymentsA.accounts.users[0].address, amount, signature) + .depositToBridge(tokenId1, depositId, deploymentsA.accounts.users[0].address, amount, expiry, signature) ) .to.emit(bridgeContract, "BridgeDeposited") .withNamedArgs({ diff --git a/packages/validator/test/02-Bridge.test.ts b/packages/validator/test/02-Bridge.test.ts index 3f3c2c9..f4b2955 100644 --- a/packages/validator/test/02-Bridge.test.ts +++ b/packages/validator/test/02-Bridge.test.ts @@ -94,7 +94,7 @@ describe("Test for Bridge", () => { const signature = await ContractUtils.signMessage(deploymentsA.accounts.deployer, arrayify(HashZero)); const tx1 = await bridgeAContract .connect(deploymentsA.accounts.deployer) - .depositLiquidity(tokenId0, liquidityAmount, signature, { value: liquidityAmount }); + .depositLiquidity(tokenId0, liquidityAmount, 0, signature, { value: liquidityAmount }); await tx1.wait(); }); @@ -104,47 +104,51 @@ describe("Test for Bridge", () => { const signature = await ContractUtils.signMessage(deploymentsB.accounts.deployer, arrayify(HashZero)); const tx1 = await bridgeBContract .connect(deploymentsB.accounts.deployer) - .depositLiquidity(tokenId0, liquidityAmount, signature, { value: liquidityAmount }); + .depositLiquidity(tokenId0, liquidityAmount, 0, signature, { value: liquidityAmount }); await tx1.wait(); }); before("Deposit BIP20 Liquidity at Bridge A", async () => { await hre.changeNetwork(config.bridge.networkAName); const liquidityAmount = Amount.make(1_000_000_000, 18).value; - const nonce = await (deploymentsA.getContract("TestLYT") as BIP20DelegatedTransfer).nonceOf( - deploymentsA.accounts.deployer.address - ); + const token = deploymentsA.getContract("TestLYT") as BIP20DelegatedTransfer; + const nonce = await token.nonceOf(deploymentsA.accounts.deployer.address); + const expiry = ContractUtils.getTimeStamp() + 60; const message = ContractUtils.getTransferMessage( + hre.getChainId(config.bridge.networkAName), + token.address, deploymentsA.accounts.deployer.address, bridgeAContract.address, liquidityAmount, nonce, - hre.getChainId(config.bridge.networkAName) + expiry ); const signature = await ContractUtils.signMessage(deploymentsA.accounts.deployer, message); const tx1 = await bridgeAContract .connect(deploymentsA.accounts.deployer) - .depositLiquidity(tokenId1, liquidityAmount, signature); + .depositLiquidity(tokenId1, liquidityAmount, expiry, signature); await tx1.wait(); }); before("Deposit BIP20 Liquidity at Bridge B", async () => { await hre.changeNetwork(config.bridge.networkBName); const liquidityAmount = Amount.make(1_000_000_000, 18).value; - const nonce = await (deploymentsB.getContract("TestLYT") as BIP20DelegatedTransfer).nonceOf( - deploymentsB.accounts.deployer.address - ); + const token = deploymentsB.getContract("TestLYT") as BIP20DelegatedTransfer; + const nonce = await token.nonceOf(deploymentsB.accounts.deployer.address); + const expiry = ContractUtils.getTimeStamp() + 60; const message = ContractUtils.getTransferMessage( + hre.getChainId(config.bridge.networkBName), + token.address, deploymentsB.accounts.deployer.address, bridgeBContract.address, liquidityAmount, nonce, - hre.getChainId(config.bridge.networkBName) + expiry ); const signature = await ContractUtils.signMessage(deploymentsB.accounts.deployer, message); const tx1 = await bridgeBContract .connect(deploymentsB.accounts.deployer) - .depositLiquidity(tokenId1, liquidityAmount, signature); + .depositLiquidity(tokenId1, liquidityAmount, expiry, signature); await tx1.wait(); }); @@ -165,7 +169,7 @@ describe("Test for Bridge", () => { await expect( bridgeAContract .connect(deploymentsA.accounts.users[0]) - .depositToBridge(tokenId0, depositId, AddressZero, 0, signature, { + .depositToBridge(tokenId0, depositId, AddressZero, 0, 0, signature, { value: amount, }) ) @@ -194,19 +198,22 @@ describe("Test for Bridge", () => { const oldLiquidity = await tokenBContract.balanceOf(bridgeBContract.address); const oldTokenBalance = await tokenBContract.balanceOf(deploymentsB.accounts.users[0].address); const nonce = await tokenBContract.nonceOf(deploymentsB.accounts.users[0].address); + const expiry = ContractUtils.getTimeStamp() + 60; const message = ContractUtils.getTransferMessage( + hre.getChainId(config.bridge.networkBName), + tokenBContract.address, deploymentsB.accounts.users[0].address, bridgeBContract.address, amount, nonce, - hre.getChainId(config.bridge.networkBName) + expiry ); depositId = ContractUtils.getRandomId(deploymentsB.accounts.users[0].address); const signature = await ContractUtils.signMessage(deploymentsB.accounts.users[0], message); await expect( bridgeBContract .connect(deploymentsB.accounts.deployer) - .depositToBridge(tokenId1, depositId, deploymentsB.accounts.users[0].address, amount, signature) + .depositToBridge(tokenId1, depositId, deploymentsB.accounts.users[0].address, amount, expiry, signature) ) .to.emit(bridgeBContract, "BridgeDeposited") .withNamedArgs({ diff --git a/yarn.lock b/yarn.lock index 82650f1..916056d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4562,10 +4562,10 @@ loupe@^2.3.6: dependencies: get-func-name "^2.0.1" -loyalty-tokens@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/loyalty-tokens/-/loyalty-tokens-1.1.0.tgz#466d5afb299699201b241674247dbbbb5087edb5" - integrity sha512-AtWw5Jc/rBy76TF9Dqo+LGBzSBC4Qlz7Z0xnKRKqsWUxlG29YjuaJ6uoZhkBNthx2HxbDD7RCDgFdAO9G9aSKA== +loyalty-tokens@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/loyalty-tokens/-/loyalty-tokens-1.1.2.tgz#f4dfdce22d01093b33ac30c70335747c71d8c4d4" + integrity sha512-Z5Ov81eewrOrTMJh8Yj1RD7llDlO/tdo5xJJo43cJmIACU6TkoajCzOfC1FWU8yiDNNNo5hAKPrptIsXEdId0Q== lru-cache@^10.0.0: version "10.2.0" @@ -4847,10 +4847,10 @@ ms@2.1.3, ms@^2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== -multisig-wallet-contracts@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/multisig-wallet-contracts/-/multisig-wallet-contracts-1.1.0.tgz#680b28bdbf9b2860bb853abdbe2b5910b1b0dfee" - integrity sha512-dJCxmOBqZZicKjshiC9SS17XPZJWSU/FpZ8eCw1WWTH08jjMudRaKMtJ/l0pjadFRUQ/wDhCUInIixoGhHyCyg== +multisig-wallet-contracts@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/multisig-wallet-contracts/-/multisig-wallet-contracts-1.1.3.tgz#202ff2e92748f2e29eaf038c018088a00fb755d8" + integrity sha512-HN+jTwjDrKWwF+RU9N2QsfpiiEegtqWYlIHPot/OGcKhkdBXWdxu5DdmA6YGI3EWEwXseSKpG+R73LdDe1GN5g== mybatis-mapper@^0.7.1: version "0.7.1"