Merge pull request #501 from ethereum/abi-translate

Do not translate constant functions from <0.4.0 as payable

Author: axic

abi.js

@@ -19,8 +19,8 @@ function update (compilerVersion, abi) {
     }
 
     if (item.type !== 'event') {
-      // add 'payable' to everything
-      if (semver.lt(compilerVersion, '0.4.0')) {
+      // add 'payable' to everything, except constant functions
+      if (!item.constant && semver.lt(compilerVersion, '0.4.0')) {
         item.payable = true;
       }
 

test/abi.js

@@ -15,11 +15,16 @@ tape('ABI translator', function (t) {
     st.deepEqual(abi.update('0.3.6', input), [ { inputs: [], payable: true, stateMutability: 'payable', type: 'constructor' }, { payable: true, stateMutability: 'payable', type: 'fallback' } ]);
     st.end();
   });
-  t.test('0.3.6 (function)', function (st) {
+  t.test('0.3.6 (non-constant function)', function (st) {
     var input = [ { inputs: [], type: 'function' } ];
     st.deepEqual(abi.update('0.3.6', input), [ { inputs: [], payable: true, stateMutability: 'payable', type: 'function' }, { payable: true, stateMutability: 'payable', type: 'fallback' } ]);
     st.end();
   });
+  t.test('0.3.6 (constant function)', function (st) {
+    var input = [ { inputs: [], type: 'function', constant: true } ];
+    st.deepEqual(abi.update('0.3.6', input), [ { inputs: [], constant: true, stateMutability: 'view', type: 'function' }, { payable: true, stateMutability: 'payable', type: 'fallback' } ]);
+    st.end();
+  });
   t.test('0.3.6 (event)', function (st) {
     var input = [ { inputs: [], type: 'event' } ];
     st.deepEqual(abi.update('0.3.6', input), [ { inputs: [], type: 'event' }, { payable: true, stateMutability: 'payable', type: 'fallback' } ]);
@@ -35,11 +40,21 @@ tape('ABI translator', function (t) {
     st.deepEqual(abi.update('0.4.0', input), [ { inputs: [], type: 'constructor', payable: true, stateMutability: 'payable' }, { type: 'fallback', stateMutability: 'nonpayable' } ]);
     st.end();
   });
+  t.test('0.4.0 (non-constant function)', function (st) {
+    var input = [ { inputs: [], type: 'function' } ];
+    st.deepEqual(abi.update('0.4.0', input), [ { inputs: [], stateMutability: 'nonpayable', type: 'function' } ]);
+    st.end();
+  });
   t.test('0.4.0 (constant function)', function (st) {
     var input = [ { inputs: [], type: 'function', constant: true } ];
     st.deepEqual(abi.update('0.4.0', input), [ { inputs: [], constant: true, stateMutability: 'view', type: 'function' } ]);
     st.end();
   });
+  t.test('0.4.0 (payable function)', function (st) {
+    var input = [ { inputs: [], payable: true, type: 'function' } ];
+    st.deepEqual(abi.update('0.4.0', input), [ { inputs: [], payable: true, stateMutability: 'payable', type: 'function' } ]);
+    st.end();
+  });
   t.test('0.4.1 (constructor not payable)', function (st) {
     var input = [ { inputs: [], payable: false, type: 'constructor' } ];
     st.deepEqual(abi.update('0.4.1', input), [ { inputs: [], payable: true, stateMutability: 'payable', type: 'constructor' } ]);