Merge pull request #146 from ethereum/statemutability

Add stateMutability field to ABI translator

Author: axic

abi.js

@@ -18,9 +18,22 @@ function update (compilerVersion, abi) {
       hasFallback = true;
     }
 
-    // add 'payable' to everything except events
-    if (item.type !== 'event' && semver.lt(compilerVersion, '0.4.0')) {
-      item.payable = true;
+    if (item.type !== 'event') {
+      // add 'payable' to everything
+      if (semver.lt(compilerVersion, '0.4.0')) {
+        item.payable = true;
+      }
+
+      // add stateMutability field
+      if (semver.lt(compilerVersion, '0.4.16')) {
+        if (item.payable) {
+          item.stateMutability = 'payable';
+        } else if (item.constant) {
+          item.stateMutability = 'view';
+        } else {
+          item.stateMutability = 'nonpayable';
+        }
+      }
     }
   }
 
@@ -29,14 +42,16 @@ function update (compilerVersion, abi) {
     abi.push({
       type: 'constructor',
       payable: true,
+      stateMutability: 'payable',
       inputs: []
     });
   }
 
   if (!hasFallback && semver.lt(compilerVersion, '0.4.0')) {
     abi.push({
       type: 'fallback',
-      payable: true
+      payable: true,
+      stateMutability: 'payable'
     });
   }
 

test/abi.js

@@ -7,37 +7,47 @@ tape('ABI translator', function (t) {
     st.end();
   });
   t.test('0.1.1 (no constructor)', function (st) {
-    st.deepEqual(abi.update('0.1.1', []), [ { inputs: [], payable: true, type: 'constructor' }, { payable: true, type: 'fallback' } ]);
+    st.deepEqual(abi.update('0.1.1', []), [ { inputs: [], payable: true, stateMutability: 'payable', type: 'constructor' }, { payable: true, stateMutability: 'payable', type: 'fallback' } ]);
     st.end();
   });
   t.test('0.3.6 (constructor)', function (st) {
     var input = [ { inputs: [], type: 'constructor' } ];
-    st.deepEqual(abi.update('0.3.6', input), [ { inputs: [], payable: true, type: 'constructor' }, { payable: true, type: 'fallback' } ]);
+    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) {
     var input = [ { inputs: [], type: 'function' } ];
-    st.deepEqual(abi.update('0.3.6', input), [ { inputs: [], payable: true, type: 'function' }, { payable: true, type: 'fallback' } ]);
+    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 (event)', function (st) {
     var input = [ { inputs: [], type: 'event' } ];
-    st.deepEqual(abi.update('0.3.6', input), [ { inputs: [], type: 'event' }, { payable: true, type: 'fallback' } ]);
+    st.deepEqual(abi.update('0.3.6', input), [ { inputs: [], type: 'event' }, { payable: true, stateMutability: 'payable', type: 'fallback' } ]);
     st.end();
   });
   t.test('0.4.0 (has fallback)', function (st) {
     var input = [ { inputs: [], type: 'constructor' } ];
-    st.deepEqual(abi.update('0.4.0', input), [ { inputs: [], payable: true, type: 'constructor' } ]);
+    st.deepEqual(abi.update('0.4.0', input), [ { inputs: [], payable: true, stateMutability: 'payable', type: 'constructor' } ]);
+    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.1 (constructor not payable)', function (st) {
     var input = [ { inputs: [], payable: false, type: 'constructor' } ];
-    st.deepEqual(abi.update('0.4.1', input), [ { inputs: [], payable: true, type: 'constructor' } ]);
+    st.deepEqual(abi.update('0.4.1', input), [ { inputs: [], payable: true, stateMutability: 'payable', type: 'constructor' } ]);
     st.end();
   });
   t.test('0.4.5 (constructor payable)', function (st) {
     var input = [ { inputs: [], payable: false, type: 'constructor' } ];
-    st.deepEqual(abi.update('0.4.5', input), [ { inputs: [], payable: false, type: 'constructor' } ]);
+    st.deepEqual(abi.update('0.4.5', input), [ { inputs: [], payable: false, stateMutability: 'nonpayable', type: 'constructor' } ]);
+    st.end();
+  });
+  t.test('0.4.16 (statemutability)', function (st) {
+    var input = [ { inputs: [], payable: false, stateMutability: 'pure', type: 'function' } ];
+    st.deepEqual(abi.update('0.4.16', input), [ { inputs: [], payable: false, stateMutability: 'pure', type: 'function' } ]);
     st.end();
   });
 });