From ba7cf9c9ccbbe0c17ec58510568fb64f8bdfacd6 Mon Sep 17 00:00:00 2001
From: Hadrien Croubois <hadrien.croubois@gmail.com>
Date: Wed, 29 Jan 2025 15:53:39 +0100
Subject: [PATCH] Expose contracts internal function as payable.

---
 src/core.test.ts.md   | 150 +++++++++++++++++++++---------------------
 src/core.test.ts.snap | Bin 2555 -> 2571 bytes
 src/core.ts           |  12 ++--
 3 files changed, 80 insertions(+), 82 deletions(-)

diff --git a/src/core.test.ts.md b/src/core.test.ts.md
index 744bb8f..f5f423f 100644
--- a/src/core.test.ts.md
+++ b/src/core.test.ts.md
@@ -49,11 +49,11 @@ Generated by [AVA](https://avajs.dev).
         constructor() payable {␊
         }␊
     ␊
-        function $_testNotImported(NotImported ni) external {␊
+        function $_testNotImported(NotImported ni) external payable {␊
             super._testNotImported(ni);␊
         }␊
     ␊
-        function $_testNotImported2(NotImported2 ni) external {␊
+        function $_testNotImported2(NotImported2 ni) external payable {␊
             super._testNotImported2(ni);␊
         }␊
     ␊
@@ -84,7 +84,7 @@ Generated by [AVA](https://avajs.dev).
         constructor() payable {␊
         }␊
     ␊
-        function $_testNotImported2(NotImported2 ni) external {␊
+        function $_testNotImported2(NotImported2 ni) external payable {␊
             super._testNotImported2(ni);␊
         }␊
     ␊
@@ -106,7 +106,7 @@ Generated by [AVA](https://avajs.dev).
         constructor(uint256 x) Parent1(x) payable {␊
         }␊
     ␊
-        function $_testParent1() external {␊
+        function $_testParent1() external payable {␊
             super._testParent1();␊
         }␊
     ␊
@@ -137,7 +137,7 @@ Generated by [AVA](https://avajs.dev).
         constructor(uint256 x) Parent1(x) payable {␊
         }␊
     ␊
-        function $_testParent1() external {␊
+        function $_testParent1() external payable {␊
             super._testParent1();␊
         }␊
     ␊
@@ -150,7 +150,7 @@ Generated by [AVA](https://avajs.dev).
         constructor(uint256 x, uint256 y) Parent1(x) Parent2(y) payable {␊
         }␊
     ␊
-        function $_testParent1() external {␊
+        function $_testParent1() external payable {␊
             super._testParent1();␊
         }␊
     ␊
@@ -163,7 +163,7 @@ Generated by [AVA](https://avajs.dev).
         constructor(uint256 x, uint256 y) Parent1(x) Parent2(y) payable {␊
         }␊
     ␊
-        function $_testParent1() external {␊
+        function $_testParent1() external payable {␊
             super._testParent1();␊
         }␊
     ␊
@@ -176,7 +176,7 @@ Generated by [AVA](https://avajs.dev).
         constructor(uint256 x, uint256 y, uint256 z, uint256 c) Parent1(x) Parent2(y) Parent3(z) Child4(c) payable {␊
         }␊
     ␊
-        function $_testParent1() external {␊
+        function $_testParent1() external payable {␊
             super._testParent1();␊
         }␊
     ␊
@@ -211,11 +211,11 @@ Generated by [AVA](https://avajs.dev).
             return $a;␊
         }␊
     ␊
-        function $__A_init(uint256 a) external {␊
+        function $__A_init(uint256 a) external payable {␊
             super.__A_init(a);␊
         }␊
     ␊
-        function $__A_init_unchained(uint256 a) external {␊
+        function $__A_init_unchained(uint256 a) external payable {␊
             super.__A_init_unchained(a);␊
         }␊
     ␊
@@ -232,19 +232,19 @@ Generated by [AVA](https://avajs.dev).
             return $a;␊
         }␊
     ␊
-        function $__B_init(uint256 b) external {␊
+        function $__B_init(uint256 b) external payable {␊
             super.__B_init(b);␊
         }␊
     ␊
-        function $__B_init_unchained(uint256 b) external {␊
+        function $__B_init_unchained(uint256 b) external payable {␊
             super.__B_init_unchained(b);␊
         }␊
     ␊
-        function $__A_init(uint256 a) external {␊
+        function $__A_init(uint256 a) external payable {␊
             super.__A_init(a);␊
         }␊
     ␊
-        function $__A_init_unchained(uint256 a) external {␊
+        function $__A_init_unchained(uint256 a) external payable {␊
             super.__A_init_unchained(a);␊
         }␊
     ␊
@@ -261,27 +261,27 @@ Generated by [AVA](https://avajs.dev).
             return $a;␊
         }␊
     ␊
-        function $__C_init() external {␊
+        function $__C_init() external payable {␊
             super.__C_init();␊
         }␊
     ␊
-        function $__C_init_unchained() external {␊
+        function $__C_init_unchained() external payable {␊
             super.__C_init_unchained();␊
         }␊
     ␊
-        function $__B_init(uint256 b) external {␊
+        function $__B_init(uint256 b) external payable {␊
             super.__B_init(b);␊
         }␊
     ␊
-        function $__B_init_unchained(uint256 b) external {␊
+        function $__B_init_unchained(uint256 b) external payable {␊
             super.__B_init_unchained(b);␊
         }␊
     ␊
-        function $__A_init(uint256 a) external {␊
+        function $__A_init(uint256 a) external payable {␊
             super.__A_init(a);␊
         }␊
     ␊
-        function $__A_init_unchained(uint256 a) external {␊
+        function $__A_init_unchained(uint256 a) external payable {␊
             super.__A_init_unchained(a);␊
         }␊
     ␊
@@ -298,11 +298,11 @@ Generated by [AVA](https://avajs.dev).
             return $x;␊
         }␊
     ␊
-        function $__X_init(uint256 x) external {␊
+        function $__X_init(uint256 x) external payable {␊
             super.__X_init(x);␊
         }␊
     ␊
-        function $__X_init_unchained(uint256 x) external {␊
+        function $__X_init_unchained(uint256 x) external payable {␊
             super.__X_init_unchained(x);␊
         }␊
     ␊
@@ -319,19 +319,19 @@ Generated by [AVA](https://avajs.dev).
             return $x;␊
         }␊
     ␊
-        function $__Y_init() external {␊
+        function $__Y_init() external payable {␊
             super.__Y_init();␊
         }␊
     ␊
-        function $__Y_init_unchained() external {␊
+        function $__Y_init_unchained() external payable {␊
             super.__Y_init_unchained();␊
         }␊
     ␊
-        function $__X_init(uint256 x) external {␊
+        function $__X_init(uint256 x) external payable {␊
             super.__X_init(x);␊
         }␊
     ␊
-        function $__X_init_unchained(uint256 x) external {␊
+        function $__X_init_unchained(uint256 x) external payable {␊
             super.__X_init_unchained(x);␊
         }␊
     ␊
@@ -348,19 +348,19 @@ Generated by [AVA](https://avajs.dev).
             return $x;␊
         }␊
     ␊
-        function $__Y_init() external {␊
+        function $__Y_init() external payable {␊
             super.__Y_init();␊
         }␊
     ␊
-        function $__Y_init_unchained() external {␊
+        function $__Y_init_unchained() external payable {␊
             super.__Y_init_unchained();␊
         }␊
     ␊
-        function $__X_init(uint256 x) external {␊
+        function $__X_init(uint256 x) external payable {␊
             super.__X_init(x);␊
         }␊
     ␊
-        function $__X_init_unchained(uint256 x) external {␊
+        function $__X_init_unchained(uint256 x) external payable {␊
             super.__X_init_unchained(x);␊
         }␊
     ␊
@@ -437,15 +437,15 @@ Generated by [AVA](https://avajs.dev).
             (ret0) = super._testStructStorageInput($v_S[t]);␊
         }␊
     ␊
-        function $_testClash_S(uint256 t) external {␊
+        function $_testClash_S(uint256 t) external payable {␊
             super._testClash($v_S[t]);␊
         }␊
     ␊
-        function $_testClash_Z(uint256 t) external {␊
+        function $_testClash_Z(uint256 t) external payable {␊
             super._testClash($v_Z[t]);␊
         }␊
     ␊
-        function $_testUDVT(Integer i) external {␊
+        function $_testUDVT(Integer i) external payable {␊
             super._testUDVT(i);␊
         }␊
     ␊
@@ -514,15 +514,15 @@ Generated by [AVA](https://avajs.dev).
             (ret0) = super._testStructStorageInput($v_S[t]);␊
         }␊
     ␊
-        function $_testClash_S(uint256 t) external {␊
+        function $_testClash_S(uint256 t) external payable {␊
             super._testClash($v_S[t]);␊
         }␊
     ␊
-        function $_testClash_Z(uint256 t) external {␊
+        function $_testClash_Z(uint256 t) external payable {␊
             super._testClash($v_Z[t]);␊
         }␊
     ␊
-        function $_testUDVT(Integer i) external {␊
+        function $_testUDVT(Integer i) external payable {␊
             super._testUDVT(i);␊
         }␊
     ␊
@@ -602,15 +602,15 @@ Generated by [AVA](https://avajs.dev).
         constructor() payable {␊
         }␊
     ␊
-        function $_testEnumType(Enum e) external {␊
+        function $_testEnumType(Enum e) external payable {␊
             super._testEnumType(e);␊
         }␊
     ␊
-        function $_testContractType(Types t) external {␊
+        function $_testContractType(Types t) external payable {␊
             super._testContractType(t);␊
         }␊
     ␊
-        function $_testMappingType(uint256 m) external {␊
+        function $_testMappingType(uint256 m) external payable {␊
             super._testMappingType($v_mapping_uint256_uint256_[m]);␊
         }␊
     ␊
@@ -641,7 +641,7 @@ Generated by [AVA](https://avajs.dev).
         constructor() payable {␊
         }␊
     ␊
-        function $_chained() external {␊
+        function $_chained() external payable {␊
             super._chained();␊
         }␊
     ␊
@@ -654,7 +654,7 @@ Generated by [AVA](https://avajs.dev).
         constructor() payable {␊
         }␊
     ␊
-        function $_chained() external {␊
+        function $_chained() external payable {␊
             super._chained();␊
         }␊
     ␊
@@ -667,7 +667,7 @@ Generated by [AVA](https://avajs.dev).
         constructor() payable {␊
         }␊
     ␊
-        function $_chained() external {␊
+        function $_chained() external payable {␊
             super._chained();␊
         }␊
     ␊
@@ -731,27 +731,27 @@ Generated by [AVA](https://avajs.dev).
         constructor() payable {␊
         }␊
     ␊
-        function $incrementInternal() external returns (uint256 ret0) {␊
+        function $incrementInternal() external payable returns (uint256 ret0) {␊
             (ret0) = super.incrementInternal();␊
             emit return$incrementInternal(ret0);␊
         }␊
     ␊
-        function $someOverloaded(uint256 arg0) external returns (bool ret0) {␊
+        function $someOverloaded(uint256 arg0) external payable returns (bool ret0) {␊
             (ret0) = super.someOverloaded(arg0);␊
             emit return$someOverloaded_uint256(ret0);␊
         }␊
     ␊
-        function $someOverloaded(bytes32 arg0) external returns (bool ret0) {␊
+        function $someOverloaded(bytes32 arg0) external payable returns (bool ret0) {␊
             (ret0) = super.someOverloaded(arg0);␊
             emit return$someOverloaded_bytes32(ret0);␊
         }␊
     ␊
-        function $dynamicReturnType() external returns (string memory ret0) {␊
+        function $dynamicReturnType() external payable returns (string memory ret0) {␊
             (ret0) = super.dynamicReturnType();␊
             emit return$dynamicReturnType(ret0);␊
         }␊
     ␊
-        function $multipleReturns(uint256 x) external returns (uint256 ret0, bytes32 ret1) {␊
+        function $multipleReturns(uint256 x) external payable returns (uint256 ret0, bytes32 ret1) {␊
             (ret0, ret1) = super.multipleReturns(x);␊
             emit return$multipleReturns(ret0, ret1);␊
         }␊
@@ -772,11 +772,11 @@ Generated by [AVA](https://avajs.dev).
         constructor() payable {␊
         }␊
     ␊
-        function $_testNotImported(NotImported ni) external {␊
+        function $_testNotImported(NotImported ni) external payable {␊
             super._testNotImported(ni);␊
         }␊
     ␊
-        function $_testNotImported2(NotImported2 ni) external {␊
+        function $_testNotImported2(NotImported2 ni) external payable {␊
             super._testNotImported2(ni);␊
         }␊
     ␊
@@ -865,11 +865,11 @@ Generated by [AVA](https://avajs.dev).
         constructor() payable {␊
         }␊
     ␊
-        function $_a_HasEnum(HasEnum arg0) external {␊
+        function $_a_HasEnum(HasEnum arg0) external payable {␊
             super._a(arg0);␊
         }␊
     ␊
-        function $_a_HasReceiveFunction(HasReceiveFunction arg0) external {␊
+        function $_a_HasReceiveFunction(HasReceiveFunction arg0) external payable {␊
             super._a(arg0);␊
         }␊
     ␊
@@ -907,11 +907,11 @@ Generated by [AVA](https://avajs.dev).
             return $a;␊
         }␊
     ␊
-        function $__A_init(uint256 a) external {␊
+        function $__A_init(uint256 a) external payable {␊
             super.__A_init(a);␊
         }␊
     ␊
-        function $__A_init_unchained(uint256 a) external {␊
+        function $__A_init_unchained(uint256 a) external payable {␊
             super.__A_init_unchained(a);␊
         }␊
     ␊
@@ -929,19 +929,19 @@ Generated by [AVA](https://avajs.dev).
             return $a;␊
         }␊
     ␊
-        function $__B_init(uint256 b) external {␊
+        function $__B_init(uint256 b) external payable {␊
             super.__B_init(b);␊
         }␊
     ␊
-        function $__B_init_unchained(uint256 b) external {␊
+        function $__B_init_unchained(uint256 b) external payable {␊
             super.__B_init_unchained(b);␊
         }␊
     ␊
-        function $__A_init(uint256 a) external {␊
+        function $__A_init(uint256 a) external payable {␊
             super.__A_init(a);␊
         }␊
     ␊
-        function $__A_init_unchained(uint256 a) external {␊
+        function $__A_init_unchained(uint256 a) external payable {␊
             super.__A_init_unchained(a);␊
         }␊
     ␊
@@ -960,27 +960,27 @@ Generated by [AVA](https://avajs.dev).
             return $a;␊
         }␊
     ␊
-        function $__C_init() external {␊
+        function $__C_init() external payable {␊
             super.__C_init();␊
         }␊
     ␊
-        function $__C_init_unchained() external {␊
+        function $__C_init_unchained() external payable {␊
             super.__C_init_unchained();␊
         }␊
     ␊
-        function $__B_init(uint256 b) external {␊
+        function $__B_init(uint256 b) external payable {␊
             super.__B_init(b);␊
         }␊
     ␊
-        function $__B_init_unchained(uint256 b) external {␊
+        function $__B_init_unchained(uint256 b) external payable {␊
             super.__B_init_unchained(b);␊
         }␊
     ␊
-        function $__A_init(uint256 a) external {␊
+        function $__A_init(uint256 a) external payable {␊
             super.__A_init(a);␊
         }␊
     ␊
-        function $__A_init_unchained(uint256 a) external {␊
+        function $__A_init_unchained(uint256 a) external payable {␊
             super.__A_init_unchained(a);␊
         }␊
     ␊
@@ -998,11 +998,11 @@ Generated by [AVA](https://avajs.dev).
             return $x;␊
         }␊
     ␊
-        function $__X_init(uint256 x) external {␊
+        function $__X_init(uint256 x) external payable {␊
             super.__X_init(x);␊
         }␊
     ␊
-        function $__X_init_unchained(uint256 x) external {␊
+        function $__X_init_unchained(uint256 x) external payable {␊
             super.__X_init_unchained(x);␊
         }␊
     ␊
@@ -1021,19 +1021,19 @@ Generated by [AVA](https://avajs.dev).
             return $x;␊
         }␊
     ␊
-        function $__Y_init() external {␊
+        function $__Y_init() external payable {␊
             super.__Y_init();␊
         }␊
     ␊
-        function $__Y_init_unchained() external {␊
+        function $__Y_init_unchained() external payable {␊
             super.__Y_init_unchained();␊
         }␊
     ␊
-        function $__X_init(uint256 x) external {␊
+        function $__X_init(uint256 x) external payable {␊
             super.__X_init(x);␊
         }␊
     ␊
-        function $__X_init_unchained(uint256 x) external {␊
+        function $__X_init_unchained(uint256 x) external payable {␊
             super.__X_init_unchained(x);␊
         }␊
     ␊
@@ -1051,19 +1051,19 @@ Generated by [AVA](https://avajs.dev).
             return $x;␊
         }␊
     ␊
-        function $__Y_init() external {␊
+        function $__Y_init() external payable {␊
             super.__Y_init();␊
         }␊
     ␊
-        function $__Y_init_unchained() external {␊
+        function $__Y_init_unchained() external payable {␊
             super.__Y_init_unchained();␊
         }␊
     ␊
-        function $__X_init(uint256 x) external {␊
+        function $__X_init(uint256 x) external payable {␊
             super.__X_init(x);␊
         }␊
     ␊
-        function $__X_init_unchained(uint256 x) external {␊
+        function $__X_init_unchained(uint256 x) external payable {␊
             super.__X_init_unchained(x);␊
         }␊
     ␊
@@ -1143,11 +1143,11 @@ Generated by [AVA](https://avajs.dev).
           constructor() payable {␊
           }␊
       ␊
-          function $_testNotImported(NotImported ni) external {␊
+          function $_testNotImported(NotImported ni) external payable {␊
               super._testNotImported(ni);␊
           }␊
       ␊
-          function $_testNotImported2(NotImported2 ni) external {␊
+          function $_testNotImported2(NotImported2 ni) external payable {␊
               super._testNotImported2(ni);␊
           }␊
       ␊
diff --git a/src/core.test.ts.snap b/src/core.test.ts.snap
index 642ca284b5cb4ba380d1eed3abce506abf6ce01a..c84c6670e6118412069024c5c534f20fe8565336 100644
GIT binary patch
literal 2571
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

literal 2555
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
RifJ7{`9G6IjrlHT007D*@rnQd

diff --git a/src/core.ts b/src/core.ts
index 2534717..0937a82 100644
--- a/src/core.ts
+++ b/src/core.ts
@@ -217,14 +217,12 @@ function getExposedContent(ast: SourceUnit, relativizePath: (p: string) => strin
                 'external',
               ];
 
-              if (fn.stateMutability !== 'nonpayable') {
-                if (fn.stateMutability === 'pure' && fnArgs.some(a => a.storageVar)) {
-                  header.push('view');
-                } else {
-                  header.push(fn.stateMutability);
-                }
-              } else if (isLibrary) {
+              if (fn.stateMutability === 'nonpayable') {
                 header.push('payable');
+              } else if (fn.stateMutability === 'pure' && fnArgs.some(a => a.storageVar)) {
+                header.push('view');
+              } else {
+                header.push(fn.stateMutability);
               }
 
               if (fn.returnParameters.parameters.length > 0) {