Merge pull request #412 from edenia/dev

Production Release
edenia · Jan 17, 2023 · 2bb80e8 · 2bb80e8
2 parents 6e1efdf + 35b1d28
commit 2bb80e8
Show file tree

Hide file tree

Showing 39 changed files with 545 additions and 189 deletions.
diff --git a/.github/workflows/push-dev-environment.yaml b/.github/workflows/push-dev-environment.yaml
@@ -61,7 +61,7 @@ jobs:
           IMAGE_NAME_HAPI: eden-spending-hapi-dev
           IMAGE_NAME_HASURA: eden-spending-hasura-dev
           IMAGE_NAME_WALLET: eden-spending-wallet-dev
-          # Postgres-0
+          # Postgres
           POSTGRES_USER: ${{ secrets.POSTGRES_USER }}
           POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
           POSTGRES_DB: ${{ secrets.POSTGRES_DB }}

diff --git a/.github/workflows/push-prod-environment.yaml b/.github/workflows/push-prod-environment.yaml
@@ -84,7 +84,7 @@ jobs:
           HAPI_DFUSE_API_KEY: ${{secrets.HAPI_DFUSE_API_KEY}}
           HAPI_DFUSE_API: eos.dfuse.eosnation.io
           HAPI_DFUSE_FIRST_BLOCK: 209174091
-          HAPI_DFUSE_FIRST_TREASURY_BLOCK: 183728436
+          HAPI_DFUSE_FIRST_TREASURY_BLOCK: 205528491
           # hasura
           HASURA_GRAPHQL_ENABLE_CONSOLE: true
           HASURA_GRAPHQL_DATABASE_URL: ${{ secrets.HASURA_GRAPHQL_DATABASE_URL }}

diff --git a/contract/edenexplorer/include/edenexplorer.hpp b/contract/edenexplorer/include/edenexplorer.hpp
@@ -23,7 +23,8 @@ namespace eden {
 
     void categorize( eosio::name  account,
                      std::string &new_memo,
-                     std::string &tx_id );
+                     std::string &tx_id,
+                     std::string &digest );
 
     bool parse_memo( std::string &memo );
 
@@ -35,6 +36,6 @@ namespace eden {
 
   EOSIO_ACTIONS( edenexplorer_contract,
                  "edenexplorer"_n,
-                 action( categorize, account, new_memo, tx_id ) )
+                 action( categorize, account, new_memo, tx_id, digest ) )
 
 } // namespace eden
diff --git a/contract/edenexplorer/src/edenexplorer.cpp b/contract/edenexplorer/src/edenexplorer.cpp
@@ -7,7 +7,8 @@ namespace eden {
 
   void edenexplorer_contract::categorize( eosio::name  account,
                                           std::string &new_memo,
-                                          std::string &tx_id ) {
+                                          std::string &tx_id,
+                                          std::string &digest ) {
     require_auth( account );
 
     eosio::action{ { get_self(), "active"_n },
@@ -20,6 +21,7 @@ namespace eden {
                   "Incorrect format or category, use: 'eden_expense: "
                   "<category>/<description>'" );
     eosio::check( tx_id.length() == 64, "Incorrect length transaction id" );
+    eosio::check( digest.length() == 64, "Incorrect length digest id" );
   }
 
   bool edenexplorer_contract::exist_category( std::string &category_name ) {

diff --git a/contract/edenexplorer/tests/tests.cpp b/contract/edenexplorer/tests/tests.cpp
@@ -7,6 +7,7 @@ TEST_CASE( "Require to be an eden member" ) {
   tester t;
 
   expect( t.edenexplorer.trace< eden::actions::categorize >( "alice"_n,
+                                                             "testing",
                                                              "testing",
                                                              "testing" ),
           "missing authority of alice" );
@@ -16,6 +17,7 @@ TEST_CASE( "Requiere the right memo format" ) {
   tester t;
 
   expect( t.edenexplorer.trace< eden::actions::categorize >( "edenexplorer"_n,
+                                                             "testing",
                                                              "testing",
                                                              "testing" ),
           "assertion failure with message: Incorrect format or category, use: "
@@ -28,6 +30,7 @@ TEST_CASE( "Requiere a right category" ) {
   expect( t.edenexplorer.trace< eden::actions::categorize >(
               "edenexplorer"_n,
               "eden_expense: testing/expense for pay EOSIO developers",
+              "testing",
               "testing" ),
           "assertion failure with message: Incorrect format or category, use: "
           "'eden_expense: <category>/<description>'" );
@@ -39,15 +42,29 @@ TEST_CASE( "Requiere the right length for tx_id" ) {
   expect( t.bob.trace< eden::actions::categorize >(
               "bob"_n,
               "eden_expense: development/expense for pay EOSIO developers",
+              "testing",
               "testing" ),
           "assertion failure with message: Incorrect length transaction id" );
 }
 
+TEST_CASE( "Requiere the right length for digest" ) {
+  tester t;
+
+  expect(
+      t.bob.trace< eden::actions::categorize >(
+          "bob"_n,
+          "eden_expense: development/expense for pay EOSIO developers",
+          "96dda25da00b945e5b696a8a4b01453c97973c78dc766a885b73e28bd42f6cc5",
+          "testing" ),
+      "assertion failure with message: Incorrect length digest id" );
+}
+
 TEST_CASE( "Succes action" ) {
   tester t;
 
   expect( t.bob.trace< eden::actions::categorize >(
       "bob"_n,
       "eden_expense: infrastructure/expense for pay EOSIO developers",
-      "96dda25da00b945e5b696a8a4b01453c97973c78dc766a885b73e28bd42f6cc5" ) );
+      "96dda25da00b945e5b696a8a4b01453c97973c78dc766a885b73e28bd42f6cc5",
+      "f3f57eaf6efe030d6af4c77818daec081e505fde4c2b15cfdad950f636400b8b" ) );
 }
diff --git a/hapi/src/gql/eden-transaction.gql.js b/hapi/src/gql/eden-transaction.gql.js
@@ -28,6 +28,7 @@ const get = async (where, getMany = false) => {
       txid
       type
       updated_at
+      digest
     }
   }
   `

diff --git a/hapi/src/services/dfuse/index.js b/hapi/src/services/dfuse/index.js
@@ -64,10 +64,9 @@ const runUpdaters = async actions => {
 
         await updater.apply({
           transaction_id: id,
-          json: matchingAction.json,
           timestamp,
-          ation: matchingAction.name,
           election: edenElectionId,
+          action: matchingAction,
           updater
         })
       }

diff --git a/hapi/src/services/dfuse/updaters/edenexplorer-categorize.updater.js b/hapi/src/services/dfuse/updaters/edenexplorer-categorize.updater.js
@@ -5,16 +5,15 @@ module.exports = {
   type: 'edenexplorer:categorize',
   apply: async action => {
     try {
-      const { new_memo, tx_id, account } = action.json
+      const { new_memo, tx_id, account, digest = undefined } = action.json
       const [, memo] = new_memo?.split(':') || ''
 
       if (!memo) return
 
       const { category, description } = updaterUtil.memoSplit(memo)
       const transactionToEditQuery = {
         txid: { _eq: tx_id },
-        type: { _eq: 'expense' },
-        eden_election: { eden_delegate: { account: { _eq: account } } }
+        ...(digest && { digest: { _eq: digest } })
       }
 
       const transactionToEdit = await edenTransactionGql.get(
@@ -34,7 +33,7 @@ module.exports = {
       const updateQuery = {
         where: {
           id: { _eq: transactionToEdit.id },
-          type: { _eq: 'expense' }
+          ...(digest && { digest: { _eq: digest } })
         },
         _set: { category, description, id_election }
       }

diff --git a/hapi/src/services/dfuse/updaters/eosiotoken-transfer.updater.js b/hapi/src/services/dfuse/updaters/eosiotoken-transfer.updater.js
@@ -10,19 +10,31 @@ let LASTEST_RATE_DATA_CONSULTED = null
 module.exports = {
   type: `eosio.token:transfer`,
   apply: async action => {
-    const { quantity, memo, to, from } = action.json
+    const { quantity, memo, to, from } = action.action.json
     const amount = Number(quantity.split(' ')[0] || 0)
 
     const registeredTransaction = await edenTransactionGql.get({
       txid: { _eq: action.transaction_id },
-      amount: { _eq: amount },
-      memo: { _eq: memo },
-      recipient: { _eq: to },
-      type: { _eq: 'expense' }
+      digest: { _eq: action.action.receipt.digest }
     })
 
     if (registeredTransaction) return
 
+    const registeredTxWithoutDigest = await edenTransactionGql.get({
+      txid: { _eq: action.transaction_id },
+      digest: { _eq: action.transaction_id }
+    })
+
+    if (registeredTxWithoutDigest) {
+      await edenTransactionGql.update({
+        where: {
+          id: { _eq: registeredTxWithoutDigest.id }
+        },
+        _set: { digest: action.action.receipt.digest }
+      })
+      return
+    }
+
     let { category, description } = updaterUtil.memoSplit(
       memo.split(':')[1] || ''
     )
@@ -72,12 +84,14 @@ module.exports = {
         type: 'expense',
         eos_exchange: LASTEST_RATE_DATA_CONSULTED,
         usd_total: amount * LASTEST_RATE_DATA_CONSULTED,
-        memo: memo
+        digest: action.action.receipt.digest
       }
 
       await edenTransactionGql.save(transactionData)
     } catch (error) {
-      console.error(`transfer sync error ${action.action}: ${error.message}`)
+      console.error(
+        `transfer sync error ${action.action.name}: ${error.message}`
+      )
     }
   }
 }
diff --git a/hapi/src/services/dfuse/updaters/genesiseden-fundtransfer.updater.js b/hapi/src/services/dfuse/updaters/genesiseden-fundtransfer.updater.js
@@ -11,7 +11,12 @@ module.exports = {
   type: `${edenConfig.edenContract}:fundtransfer`,
   apply: async action => {
     try {
-      const { amount: quantity, from, distribution_time, rank } = action.json
+      const {
+        amount: quantity,
+        from,
+        distribution_time,
+        rank
+      } = action.action.json
       const amount = Number(quantity.split(' ')[0])
 
       const existTx = await edenTransactionGql.get({
@@ -72,13 +77,13 @@ module.exports = {
         const newAmount = existUnclaimedTx.amount - amount
 
         if (newAmount <= 0) {
-          await deleteTx({
+          await edenTransactionGql.deleteTx({
             where: {
               id: { _eq: existUnclaimedTx.id }
             }
           })
         } else {
-          await update({
+          await edenTransactionGql.update({
             where: {
               id: { _eq: existUnclaimedTx.id }
             },
@@ -95,7 +100,7 @@ module.exports = {
       }
     } catch (error) {
       console.error(
-        `fundtransfer sync error ${action.action}: ${error.message}`
+        `fundtransfer sync error ${action.action.action.name}: ${error.message}`
       )
     }
   }

diff --git a/hapi/src/utils/dfuse.util.js b/hapi/src/utils/dfuse.util.js
@@ -18,6 +18,9 @@ const getfundTransferQuery = ({ query, lowBlockNum }) => {
         }
         id
         matchingActions {
+          receipt {
+            digest
+          }
           account
           name
           json

diff --git a/hasura/metadata/databases/default/tables/public_eden_transaction.yaml b/hasura/metadata/databases/default/tables/public_eden_transaction.yaml
@@ -10,20 +10,20 @@ insert_permissions:
     permission:
       check: {}
       columns:
+        - amount
         - category
+        - created_at
+        - date
         - description
-        - memo
+        - digest
+        - eos_exchange
+        - id
+        - id_election
         - recipient
         - txid
         - type
-        - amount
-        - eos_exchange
-        - usd_total
-        - created_at
-        - date
         - updated_at
-        - id
-        - id_election
+        - usd_total
 select_permissions:
   - role: guest
     permission:
@@ -33,10 +33,10 @@ select_permissions:
         - created_at
         - date
         - description
+        - digest
         - eos_exchange
         - id
         - id_election
-        - memo
         - recipient
         - txid
         - type

diff --git a/...ions/default/1673556739883_alter_table_public_eden_transaction_add_column_digest/down.sql b/...ions/default/1673556739883_alter_table_public_eden_transaction_add_column_digest/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."eden_transaction" add column "digest" varchar
+--  null;
diff --git a/...ations/default/1673556739883_alter_table_public_eden_transaction_add_column_digest/up.sql b/...ations/default/1673556739883_alter_table_public_eden_transaction_add_column_digest/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."eden_transaction" add column "digest" varchar
+ null;
diff --git a/...tions/default/1673565665020_alter_table_public_eden_transaction_drop_column_memo/down.sql b/...tions/default/1673565665020_alter_table_public_eden_transaction_drop_column_memo/down.sql
@@ -0,0 +1,3 @@
+comment on column "public"."eden_transaction"."memo" is E'Eden Transaction Accounting Standard';
+alter table "public"."eden_transaction" alter column "memo" drop not null;
+alter table "public"."eden_transaction" add column "memo" varchar;
diff --git a/...rations/default/1673565665020_alter_table_public_eden_transaction_drop_column_memo/up.sql b/...rations/default/1673565665020_alter_table_public_eden_transaction_drop_column_memo/up.sql
@@ -0,0 +1 @@
+alter table "public"."eden_transaction" drop column "memo" cascade;
diff --git a/webapp/src/components/BarChartReport/index.js b/webapp/src/components/BarChartReport/index.js
@@ -120,6 +120,7 @@ const BarChartReport = ({
   const { t } = useTranslation()
   const [selectedUSD, setSelected] = useState(false)
   const [coinType, setCoinType] = useState('EOS')
+  const width = window.innerWidth
 
   const handleChange = event => {
     setSelected(event.target.checked)
@@ -166,12 +167,7 @@ const BarChartReport = ({
         </div>
       </div>
       <div className={classes.chartContainer}>
-        <ResponsiveContainer
-          minWidth={600}
-          width="100%"
-          height={300}
-          marginTop="16px"
-        >
+        <ResponsiveContainer width="100%" height={300} marginTop="16px">
           <ComposedChart height={300} data={data} ref={barRef}>
             <CartesianGrid stroke="#f0f0f0" />
             <XAxis
@@ -197,7 +193,7 @@ const BarChartReport = ({
             )}
             <Bar
               dataKey={`${coinType}_UN${category.toLocaleUpperCase()}`}
-              barSize={35}
+              barSize={width > 600 ? 35 : 15}
               fill="#f4d35e"
             >
               {data.map(({ election }) => (
@@ -206,14 +202,18 @@ const BarChartReport = ({
             </Bar>
             <Bar
               dataKey={`${coinType}_${category.toLocaleUpperCase()}`}
-              barSize={35}
+              barSize={width > 600 ? 35 : 15}
               fill="#ee964b"
             >
               {data.map(({ election }) => (
                 <Cell key={`cell-${election}`} />
               ))}
             </Bar>
-            <Bar dataKey={`${coinType}_TOTAL`} barSize={35} fill="#19647e">
+            <Bar
+              dataKey={`${coinType}_TOTAL`}
+              barSize={width > 600 ? 35 : 15}
+              fill="#19647e"
+            >
               {data.map(({ election }) => (
                 <Cell key={`cell-${election}`} />
               ))}

diff --git a/webapp/src/components/BarChartReport/styles.js b/webapp/src/components/BarChartReport/styles.js
@@ -1,10 +1,16 @@
 export default theme => ({
   root: {
-    margin: theme.spacing(6, 6, 6, 6)
+    margin: theme.spacing(6, 6, 6, 6),
+    [theme.breakpoints.down('sm')]: {
+      margin: theme.spacing(6, 1, 6, 1)
+    }
   },
   chartContainer: {
     whiteSpace: 'nowrap',
-    overflowY: 'hidden'
+    overflowY: 'hidden',
+    [theme.breakpoints.down('sm')]: {
+      overflowX: 'hidden'
+    }
   },
   title: {
     '& span': {
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,6 +28,7 @@ const get = async (where, getMany = false) => { @@
           txid
           type
           updated_at
+          digest
         }
       }
       `
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		alter table "public"."eden_transaction" add column "digest" varchar
		null;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		alter table "public"."eden_transaction" drop column "memo" cascade;