Update MultiToken lib to 2.0.0-beta.6

PWNDAO · Oct 4, 2022 · 67d159f · 67d159f
1 parent d087483
commit 67d159f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,9 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-[submodule "lib/MultiToken"]
-	path = lib/MultiToken
-	url = https://github.com/PWNFinance/MultiToken
 [submodule "lib/openzeppelin-contracts"]
 	path = lib/openzeppelin-contracts
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
+[submodule "lib/MultiToken"]
+	path = lib/MultiToken
+	url = https://github.com/PWNFinance/MultiToken
diff --git a/lib/MultiToken b/lib/MultiToken
diff --git a/src/PWNVault.sol b/src/PWNVault.sol
@@ -47,7 +47,7 @@ abstract contract PWNVault is IERC721Receiver, IERC1155Receiver {
      * @param beneficiary An address of the recipient of the asset - is set in the PWN logic contract
      */
     function _push(MultiToken.Asset memory asset, address beneficiary) internal {
-        asset.transferAsset(beneficiary);
+        asset.safeTransferAssetFrom(address(this), beneficiary);
         emit VaultPush(asset, beneficiary);
     }
 
@@ -64,7 +64,7 @@ abstract contract PWNVault is IERC721Receiver, IERC1155Receiver {
      */
     function _pushFrom(MultiToken.Asset memory asset, address origin, address beneficiary, bytes memory permit) internal {
         _handlePermit(asset, origin, permit);
-        asset.transferAssetFrom(origin, beneficiary);
+        asset.safeTransferAssetFrom(origin, beneficiary);
         emit VaultPushFrom(asset, origin, beneficiary);
     }