Merge pull request #976 from lukso-network/patch-allowance

lukso-network · Sep 27, 2024 · 50f0a07 · 50f0a07
2 parents 0c5f496 + 96b0dad
commit 50f0a07
Show file tree

Hide file tree

Showing 2 changed files with 75 additions and 1 deletion.
diff --git a/packages/lsp-smart-contracts/tests/LSP7DigitalAsset/LSP7DigitalAsset.behaviour.ts b/packages/lsp-smart-contracts/tests/LSP7DigitalAsset/LSP7DigitalAsset.behaviour.ts
@@ -2206,6 +2206,80 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
     });
   });
 
+  describe('when transferring 0 as amount', () => {
+    describe('when the caller is the tokenOwner', () => {
+      it('should succeed', async () => {
+        const tokenOwner = context.accounts.owner.address;
+        const recipient = context.accounts.anyone.address;
+        const amount = 0;
+
+        await expect(
+          context.lsp7
+            .connect(context.accounts.owner)
+            .transfer(tokenOwner, recipient, amount, true, '0x'),
+        )
+          .to.emit(context.lsp7, 'Transfer')
+          .withArgs(tokenOwner, tokenOwner, recipient, amount, true, '0x');
+      });
+    });
+
+    describe('when the caller is the operator', () => {
+      describe("when the caller doesn't have an authorized amount", () => {
+        it('should revert', async () => {
+          const operator = context.accounts.operator.address;
+          const tokenOwner = context.accounts.owner.address;
+          const recipient = context.accounts.anyone.address;
+          const amount = 0;
+
+          await expect(
+            context.lsp7
+              .connect(context.accounts.operator)
+              .transfer(tokenOwner, recipient, amount, true, '0x'),
+          )
+            .to.be.revertedWithCustomError(context.lsp7, 'LSP7AmountExceedsAuthorizedAmount')
+            .withArgs(tokenOwner, 0, operator, amount);
+        });
+      });
+      describe('when the caller have an authorized amount', () => {
+        it('should succeed', async () => {
+          const operator = context.accounts.operator.address;
+          const tokenOwner = context.accounts.owner.address;
+          const recipient = context.accounts.anyone.address;
+          const amountAuthorized = 100;
+          const amount = 0;
+
+          // pre-conditions
+          await context.lsp7
+            .connect(context.accounts.owner)
+            .authorizeOperator(operator, amountAuthorized, '0x');
+          expect(await context.lsp7.authorizedAmountFor(operator, tokenOwner)).to.equal(
+            amountAuthorized,
+          );
+
+          await expect(
+            context.lsp7
+              .connect(context.accounts.operator)
+              .transfer(tokenOwner, recipient, amount, true, '0x'),
+          )
+            .to.emit(context.lsp7, 'Transfer')
+            .withArgs(operator, tokenOwner, recipient, amount, true, '0x');
+        });
+      });
+    });
+
+    describe('when making a call with sending value', () => {
+      it('should revert', async () => {
+        const amountSent = 200;
+        await expect(
+          context.accounts.anyone.sendTransaction({
+            to: await context.lsp7.getAddress(),
+            value: amountSent,
+          }),
+        ).to.be.revertedWithCustomError(context.lsp7, 'LSP7TokenContractCannotHoldValue');
+      });
+    });
+  });
+
   describe('batchCalls', () => {
     describe('when using one function', () => {
       describe('using `mint(...)`', () => {

diff --git a/packages/lsp7-contracts/contracts/LSP7DigitalAssetCore.sol b/packages/lsp7-contracts/contracts/LSP7DigitalAssetCore.sol
@@ -558,7 +558,7 @@ abstract contract LSP7DigitalAssetCore is ILSP7DigitalAsset {
             operator
         ];
 
-        if (amountToSpend > authorizedAmount) {
+        if (authorizedAmount == 0 || amountToSpend > authorizedAmount) {
             revert LSP7AmountExceedsAuthorizedAmount(
                 tokenOwner,
                 authorizedAmount,