campaign state decoding

src/campaign.js

@@ -32,13 +32,27 @@ export default function Campaign (web3, address, { context, _decodeLog }) {
     }
   }
 
-  const state = async () => instance.methods.getState().call()
+  const stateRaw = async () => instance.methods.getState().call()
   const isIssued = async () => instance.methods.campaignIssued().call()
   const issuance = async () => instance.methods.issuance().call()
   const available = async () => instance.methods.available().call()
   const acquired = async () => instance.methods.acquired().call()
   const redeemed = async () => instance.methods.redeemed().call()
 
+  const state = async () => {
+    const data = await stateRaw()
+    const result = {
+      issued: web3.utils.hexToNumber('0x' + data.slice(10, 12)) > 0
+    }
+    if (result.issued) {
+      result.issuance = web3.utils.hexToNumber(data.slice(0, 10))
+      result.free = web3.utils.hexToNumber('0x' + data.slice(12, 20))
+      result.acquired = web3.utils.hexToNumber('0x' + data.slice(20, 28))
+      result.redeemed = web3.utils.hexToNumber('0x' + data.slice(28, 36))
+    }
+    return result
+  }
+
   const _isAuthorized = async (address, auth) => (await instance.methods.isAuthorized(
     address, RougeAuthorization.All
   ).call()) || instance.methods.isAuthorized(
@@ -123,8 +137,6 @@ export default function Campaign (web3, address, { context, _decodeLog }) {
 
       const receipt = await _transact(method, address)
       // const Issuance = _decodeLog('Issuance', receipt.logs[0])
-      console.log('receipt', receipt)
-
       return receipt
     } catch (e) {
       throw new Error(`[rouge.js] issueCampaign failed: ${e}`)

src/rouge.js

@@ -96,6 +96,8 @@ function RougeProtocol (web3, context = {}) {
   const _decodeLog = (name, log) => ({
     _event: name,
     _address: log.address,
+    _blockNumber: log.blockNumber,
+    _transactionHash: log.transactionHash,
     _log: log,
     ...web3.eth.abi.decodeLog(_AbiEvents[name].inputs, log.data, log.topics.slice(1))
   })
@@ -139,20 +141,16 @@ function RougeProtocol (web3, context = {}) {
 
   // const getCampaignList = async ({issuer}) => {
   // // NewCampaign TODO add in protocol issuer + version protocol
-
-  // event Issuance(bytes4 indexed scheme, string name, uint campaignExpiration);
   // TODO add in protocol issuer + version protocol
   const getIssuedCampaignList = async ({scheme, issuer}) => {
+    // TODO issuer // protocol version filter
     try {
       const abiSignEvent = web3.eth.abi.encodeEventSignature(_AbiEvents['Issuance'])
       const encodedScheme = web3.utils.padRight(scheme, 64)
-      console.log('xxx', abiSignEvent, encodedScheme)
       const logs = await web3.eth.getPastLogs({
-        fromBlock: 4056827, // should be factory/version create block by default
-        // fromBlock: 4056827, // should be factory/version create block by default
+        fromBlock: 1, // 4056827, should be factory/version create block by default per network ?
         topics: [abiSignEvent, encodedScheme]
       })
-
       return Promise.resolve(logs.map(log => _decodeLog('Issuance', log)))
     } catch (e) {
       return Promise.reject(new Error(`[rouge.js] getIssuedCampaignList failed: ${e}`))

test/campaign.test.js

@@ -15,7 +15,7 @@ beforeAll(async () => { mockup = await initializeWeb3() })
 const defaultTare = '100000'
 const campaignCreationTestDefaulParams = {
   name: 'Jest __tests__ campaign',
-  issuance: '2'
+  issuance: 3
 }
 
 describe('RougeProtocol(web3).createCampaign()', () => {
@@ -45,7 +45,7 @@ describe('RougeProtocol(web3).createCampaign()', () => {
   })
 
   describe('issuance * tare RGE tokens have been from issuer to campaign contract', () => {
-    const expected = parseInt(defaultTare) * parseInt(campaignCreationTestDefaulParams.issuance)
+    const expected = parseInt(defaultTare) * campaignCreationTestDefaulParams.issuance
     test(
       `rge.balanceOf(campaign) should return ${expected}`,
       () => campaignPromise.then(
@@ -84,12 +84,16 @@ describe('RougeProtocol(web3).createCampaign()', () => {
   })
 
   describe('campaign.info()', () => {
-    const expected = '0001ffff00000000000000000000000000000000000000000000000000000000'
+    const expected = a => ({
+      issuer: a,
+      name: 'Jest __tests__ campaign',
+      scheme: '0x0001ffff'
+    })
     test(
-      `should return a string containing issuer+${expected}`,
+      `should return an object containing ${JSON.stringify(expected)}`,
       () => campaignPromise.then(
         async campaign => expect(await campaign.info).toEqual(
-          expect.stringContaining(mockup.accounts[0].toLowerCase() + expected)
+          expect.objectContaining(expected(mockup.accounts[0]))
         )
       )
     )
@@ -135,9 +139,13 @@ describe('RougeProtocol(web3).createCampaign()', () => {
   })
 
   describe('campaign.state()', () => {
-    const expected =
-          '0x0000000' + campaignCreationTestDefaulParams.issuance +
-          '010000000' + campaignCreationTestDefaulParams.issuance + '0000000000000000'
+    const expected = {
+      acquired: 0,
+      free: campaignCreationTestDefaulParams.issuance,
+      issuance: campaignCreationTestDefaulParams.issuance,
+      issued: true,
+      redeemed: 0
+    }
     test(
       `should return ${JSON.stringify(expected)}`,
       () => campaignPromise.then(
@@ -147,7 +155,7 @@ describe('RougeProtocol(web3).createCampaign()', () => {
   })
 
   describe('campaign.issuance()', () => {
-    const expected = campaignCreationTestDefaulParams.issuance
+    const expected = campaignCreationTestDefaulParams.issuance.toString()
     test(
       `should return ${JSON.stringify(expected)}`,
       () => campaignPromise.then(
@@ -167,7 +175,7 @@ describe('RougeProtocol(web3).createCampaign()', () => {
   })
 
   describe('campaign.available()', () => {
-    const expected = campaignCreationTestDefaulParams.issuance
+    const expected = campaignCreationTestDefaulParams.issuance.toString()
     test(
       `should return ${JSON.stringify(expected)}`,
       () => campaignPromise.then(