method signature lookups, parameter decoding & management

js/src/abi/spec/event/event.js

@@ -26,13 +26,20 @@ export default class Event {
     this._name = abi.name;
     this._inputs = EventParam.toEventParams(abi.inputs || []);
     this._anonymous = !!abi.anonymous;
-    this._signature = eventSignature(this._name, this.inputParamTypes());
+
+    const { id, signature } = eventSignature(this._name, this.inputParamTypes());
+    this._id = id;
+    this._signature = signature;
   }
 
   get name () {
     return this._name;
   }
 
+  get id () {
+    return this._id;
+  }
+
   get inputs () {
     return this._inputs;
   }

js/src/abi/spec/function.js

@@ -26,7 +26,10 @@ export default class Func {
     this._payable = abi.payable;
     this._inputs = Param.toParams(abi.inputs || []);
     this._outputs = Param.toParams(abi.outputs || []);
-    this._signature = methodSignature(this._name, this.inputParamTypes());
+
+    const { id, signature } = methodSignature(this._name, this.inputParamTypes());
+    this._id = id;
+    this._signature = signature;
   }
 
   get constant () {
@@ -37,6 +40,10 @@ export default class Func {
     return this._name;
   }
 
+  get id () {
+    return this._id;
+  }
+
   get payable () {
     return this._payable;
   }

js/src/abi/util/signature.js

@@ -21,9 +21,11 @@ export function eventSignature (name, params) {
   const types = (params || []).map(fromParamType).join(',');
   const id = `${name || ''}(${types})`;
 
-  return keccak_256(id);
+  return { id, signature: keccak_256(id) };
 }
 
 export function methodSignature (name, params) {
-  return eventSignature(name, params).substr(0, 8);
+  const { id, signature } = eventSignature(name, params);
+
+  return { id, signature: signature.substr(0, 8) };
 }

js/src/abi/util/signature.spec.js

@@ -20,49 +20,49 @@ describe('abi/util/signature', () => {
   describe('eventSignature', () => {
     it('encodes signature baz() correctly', () => {
       expect(eventSignature('baz', []))
-        .to.equal('a7916fac4f538170f7cd12c148552e2cba9fcd72329a2dd5b07a6fa906488ddf');
+        .to.deep.equal({ id: 'baz()', signature: 'a7916fac4f538170f7cd12c148552e2cba9fcd72329a2dd5b07a6fa906488ddf' });
     });
 
     it('encodes signature baz(uint32) correctly', () => {
       expect(eventSignature('baz', [{ type: 'uint', length: 32 }]))
-        .to.equal('7d68785e8fc871be024b75964bd86d093511d4bc2dc7cf7bea32c48a0efaecb1');
+        .to.deep.equal({ id: 'baz(uint32)', signature: '7d68785e8fc871be024b75964bd86d093511d4bc2dc7cf7bea32c48a0efaecb1' });
     });
 
     it('encodes signature baz(uint32, bool) correctly', () => {
       expect(eventSignature('baz', [{ type: 'uint', length: 32 }, { type: 'bool' }]))
-        .to.equal('cdcd77c0992ec5bbfc459984220f8c45084cc24d9b6efed1fae540db8de801d2');
+        .to.deep.equal({ id: 'baz(uint32,bool)', signature: 'cdcd77c0992ec5bbfc459984220f8c45084cc24d9b6efed1fae540db8de801d2' });
     });
 
     it('encodes no-name signature correctly as ()', () => {
       expect(eventSignature(undefined, []))
-        .to.equal('861731d50c3880a2ca1994d5ec287b94b2f4bd832a67d3e41c08177bdd5674fe');
+        .to.deep.equal({ id: '()', signature: '861731d50c3880a2ca1994d5ec287b94b2f4bd832a67d3e41c08177bdd5674fe' });
     });
 
     it('encodes no-params signature correctly as ()', () => {
       expect(eventSignature(undefined, undefined))
-        .to.equal('861731d50c3880a2ca1994d5ec287b94b2f4bd832a67d3e41c08177bdd5674fe');
+        .to.deep.equal({ id: '()', signature: '861731d50c3880a2ca1994d5ec287b94b2f4bd832a67d3e41c08177bdd5674fe' });
     });
   });
 
   describe('methodSignature', () => {
     it('encodes signature baz() correctly', () => {
-      expect(methodSignature('baz', [])).to.equal('a7916fac');
+      expect(methodSignature('baz', [])).to.deep.equal({ id: 'baz()', signature: 'a7916fac' });
     });
 
     it('encodes signature baz(uint32) correctly', () => {
-      expect(methodSignature('baz', [{ type: 'uint', length: 32 }])).to.equal('7d68785e');
+      expect(methodSignature('baz', [{ type: 'uint', length: 32 }])).to.deep.equal({ id: 'baz(uint32)', signature: '7d68785e' });
     });
 
     it('encodes signature baz(uint32, bool) correctly', () => {
-      expect(methodSignature('baz', [{ type: 'uint', length: 32 }, { type: 'bool' }])).to.equal('cdcd77c0');
+      expect(methodSignature('baz', [{ type: 'uint', length: 32 }, { type: 'bool' }])).to.deep.equal({ id: 'baz(uint32,bool)', signature: 'cdcd77c0' });
     });
 
     it('encodes no-name signature correctly as ()', () => {
-      expect(methodSignature(undefined, [])).to.equal('861731d5');
+      expect(methodSignature(undefined, [])).to.deep.equal({ id: '()', signature: '861731d5' });
     });
 
     it('encodes no-params signature correctly as ()', () => {
-      expect(methodSignature(undefined, undefined)).to.equal('861731d5');
+      expect(methodSignature(undefined, undefined)).to.deep.equal({ id: '()', signature: '861731d5' });
     });
   });
 });

js/src/contracts/contracts.js

@@ -0,0 +1,52 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import Registry from './registry';
+import SignatureReg from './signaturereg';
+import TokenReg from './tokenreg';
+
+let instance = null;
+
+export default class Contracts {
+  constructor (api) {
+    instance = this;
+
+    this._api = api;
+    this._registry = new Registry(api);
+    this._signaturereg = new SignatureReg(api, this._registry);
+    this._tokenreg = new TokenReg(api, this._registry);
+  }
+
+  get registry () {
+    return this._registry;
+  }
+
+  get signatureReg () {
+    return this._signaturereg;
+  }
+
+  get tokenReg () {
+    return this._tokenreg;
+  }
+
+  static create (api) {
+    return new Contracts(api);
+  }
+
+  static get () {
+    return instance;
+  }
+}

js/src/contracts/index.js

@@ -0,0 +1,17 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default from './contracts';

js/src/contracts/registry.js

@@ -0,0 +1,74 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import * as abis from '../json';
+
+export default class Registry {
+  constructor (api) {
+    this._api = api;
+    this._contracts = [];
+    this._instance = null;
+
+    this.getInstance();
+  }
+
+  getInstance () {
+    return new Promise((resolve, reject) => {
+      if (this._instance) {
+        resolve(this._instance);
+        return;
+      }
+
+      this._api.ethcore
+        .registryAddress()
+        .then((address) => {
+          this._instance = this._api.newContract(abis.registry, address).instance;
+          resolve(this._instance);
+        })
+        .catch(reject);
+    });
+  }
+
+  getContractInstance (_name) {
+    const name = _name.toLowerCase();
+
+    return new Promise((resolve, reject) => {
+      if (this._contracts[name]) {
+        resolve(this._contracts[name]);
+        return;
+      }
+
+      this
+        .lookupAddress(name)
+        .then((address) => {
+          this._contracts[name] = this._api.newContract(abis[name], address).instance;
+          resolve(this._contracts[name]);
+        })
+        .catch(reject);
+    });
+  }
+
+  lookupAddress (_name) {
+    const name = _name.toLowerCase();
+
+    return this.getInstance().then((instance) => {
+      if (name === 'signaturereg') {
+        return '0xD1888764222dbE5BBa54F0cf9d493e43aba667Fb';
+      }
+      return instance.getAddress.call({}, [this._api.util.sha3(name), 'A']);
+    });
+  }
+}

js/src/contracts/signaturereg.js

@@ -0,0 +1,34 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default class SignatureReg {
+  constructor (api, registry) {
+    this._api = api;
+    this._registry = registry;
+
+    this.getInstance();
+  }
+
+  getInstance () {
+    return this._registry.getContractInstance('signaturereg');
+  }
+
+  lookup (signature) {
+    return this.getInstance().then((instance) => {
+      return instance.get.call({}, [signature]);
+    });
+  }
+}

js/src/contracts/tokenreg.js

@@ -0,0 +1,41 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default class TokenReg {
+  constructor (api, registry) {
+    this._api = api;
+    this._registry = registry;
+    this._instance = null;
+
+    this.getInstance();
+  }
+
+  getInstance () {
+    return this._registry.getContractInstance('tokenreg');
+  }
+
+  tokenCount () {
+    return this.getInstance().then((instance) => {
+      return instance.tokenCount.call();
+    });
+  }
+
+  token (index) {
+    return this.getInstance().then((instance) => {
+      return instance.token.call({}, [index]);
+    });
+  }
+}

js/src/dapps/gavcoin/parity.js

@@ -1,3 +1,19 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
 const { api } = window.parity;
 
 export {

js/src/dapps/signaturereg.html

@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <title>Method Signature Registry</title>
+    <link href="//fonts.googleapis.com/css?family=Roboto:300" rel="stylesheet">
+    <link href="//fonts.googleapis.com/css?family=Roboto+Mono:300" rel="stylesheet">
+  </head>
+  <body>
+    <div id="container"></div>
+    <script src="vendor.js"></script>
+    <script src="commons.js"></script>
+    <script src="parity.js"></script>
+    <script src="signaturereg.js"></script>
+  </body>
+</html>