Merge branch 'master' into fix-elopage-status

backend/src/graphql/model/Balance.ts

@@ -1,6 +1,5 @@
 import { ObjectType, Field } from 'type-graphql'
 import Decimal from 'decimal.js-light'
-import CONFIG from '@/config'
 
 @ObjectType()
 export class Balance {
@@ -11,7 +10,6 @@ export class Balance {
     balanceGDT: number | null
     count: number
     linkCount: number
-    decayStartBlock?: Date
     lastBookedDate?: Date | null
   }) {
     this.balance = data.balance
@@ -20,7 +18,6 @@ export class Balance {
     this.balanceGDT = data.balanceGDT || null
     this.count = data.count
     this.linkCount = data.linkCount
-    this.decayStartBlock = data.decayStartBlock || CONFIG.DECAY_START_TIME
     this.lastBookedDate = data.lastBookedDate || null
   }
 
@@ -46,9 +43,6 @@ export class Balance {
   @Field(() => Number)
   linkCount: number
 
-  @Field(() => Date)
-  decayStartBlock: Date
-
   // may be null as there may be no transaction
   @Field(() => Date, { nullable: true })
   lastBookedDate: Date | null

backend/src/seeds/graphql/queries.ts

@@ -59,7 +59,6 @@ export const transactionsQuery = gql`
       balanceGDT
       count
       balance
-      decayStartBlock
       transactions {
         id
         typeId

frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue

@@ -50,7 +50,6 @@ export default {
   name: 'DecayInformation-StartBlock',
   props: {
     balanceDate: { type: String },
-    decayStartBlock: { type: Date },
     amount: {
       type: String,
     },

frontend/src/components/DecayInformations/DecayInformation.vue

@@ -14,6 +14,7 @@
 import DecayInformationLong from '../DecayInformations/DecayInformation-Long'
 import DecayInformationBeforeStartblock from '../DecayInformations/DecayInformation-BeforeStartblock'
 import DecayInformationDecayStartblock from '../DecayInformations/DecayInformation-DecayStartblock'
+import CONFIG from '@/config'
 
 export default {
   components: {
@@ -34,14 +35,10 @@ export default {
       type: String,
       required: true,
     },
-    decayStartBlock: {
-      type: Date,
-      required: true,
-    },
   },
   computed: {
     isStartBlock() {
-      return new Date(this.decay.start).getTime() === this.decayStartBlock.getTime()
+      return new Date(this.decay.start).getTime() === CONFIG.DECAY_START_TIME.getTime()
     },
   },
 }

frontend/src/components/GddTransactionList.vue

@@ -26,7 +26,6 @@
             <transaction-send
               class="list-group-item"
               v-bind="transactions[index]"
-              :decayStartBlock="decayStartBlock"
               :previousBookedBalance="previousBookedBalance(index)"
               v-on="$listeners"
             />
@@ -36,7 +35,6 @@
             <transaction-receive
               class="list-group-item"
               v-bind="transactions[index]"
-              :decayStartBlock="decayStartBlock"
               :previousBookedBalance="previousBookedBalance(index)"
               v-on="$listeners"
             />
@@ -46,7 +44,6 @@
             <transaction-creation
               class="list-group-item"
               v-bind="transactions[index]"
-              :decayStartBlock="decayStartBlock"
               :previousBookedBalance="previousBookedBalance(index)"
               v-on="$listeners"
             />
@@ -105,7 +102,6 @@ export default {
     }
   },
   props: {
-    decayStartBlock: { type: Date },
     transactions: { default: () => [] },
     pageSize: { type: Number, default: 25 },
     timestamp: { type: Number, default: 0 },

frontend/src/components/Transactions/TransactionCreation.vue

@@ -27,12 +27,7 @@
       </div>
 
       <b-collapse :class="visible ? 'bg-secondary' : ''" class="pb-4 pt-5" v-model="visible">
-        <decay-information
+        <decay-information :typeId="typeId" :decay="decay" :amount="amount" />
-          :typeId="typeId"
-          :decay="decay"
-          :amount="amount"
-          :decayStartBlock="decayStartBlock"
-        />
       </b-collapse>
     </div>
   </div>
@@ -82,10 +77,6 @@ export default {
       type: String,
       required: true,
     },
-    decayStartBlock: {
-      type: Date,
-      required: true,
-    },
     previousBookedBalance: {
       type: String,
       required: true,

frontend/src/components/Transactions/TransactionReceive.vue

@@ -33,12 +33,7 @@
       </div>
 
       <b-collapse :class="visible ? 'bg-secondary' : ''" class="pb-4 pt-5" v-model="visible">
-        <decay-information
+        <decay-information :typeId="typeId" :decay="decay" :amount="amount" />
-          :typeId="typeId"
-          :decay="decay"
-          :amount="amount"
-          :decayStartBlock="decayStartBlock"
-        />
       </b-collapse>
     </div>
   </div>
@@ -87,10 +82,6 @@ export default {
     typeId: {
       type: String,
     },
-    decayStartBlock: {
-      type: Date,
-      required: true,
-    },
     transactionLinkId: {
       type: Number,
       required: false,

frontend/src/components/Transactions/TransactionSend.vue

@@ -33,12 +33,7 @@
       </div>
 
       <b-collapse :class="visible ? 'bg-secondary' : ''" class="pb-4 pt-5" v-model="visible">
-        <decay-information
+        <decay-information :typeId="typeId" :decay="decay" :amount="amount" />
-          :typeId="typeId"
-          :decay="decay"
-          :amount="amount"
-          :decayStartBlock="decayStartBlock"
-        />
       </b-collapse>
     </div>
   </div>
@@ -88,10 +83,6 @@ export default {
       type: String,
       required: true,
     },
-    decayStartBlock: {
-      type: Date,
-      required: true,
-    },
     transactionLinkId: {
       type: Number,
       required: false,

frontend/src/config/index.js

@@ -5,6 +5,7 @@
 const pkg = require('../../package')
 
 const constants = {
+  DECAY_START_TIME: new Date('2021-05-13 17:46:31'), // GMT+0
   CONFIG_VERSION: {
     DEFAULT: 'DEFAULT',
     EXPECTED: 'v1.2022-03-18',

frontend/src/config/index.spec.js

@@ -0,0 +1,9 @@
+import CONFIG from './index'
+
+describe('config/index', () => {
+  describe('decay start block', () => {
+    it('has the correct date set', () => {
+      expect(CONFIG.DECAY_START_TIME).toEqual(new Date('2021-05-13 17:46:31'))
+    })
+  })
+})

frontend/src/graphql/queries.js

@@ -52,7 +52,6 @@ export const transactionsQuery = gql`
         balanceGDT
         count
         linkCount
-        decayStartBlock
         lastBookedDate
       }
       transactions {

frontend/src/layouts/DashboardLayout_gdd.vue

@@ -26,7 +26,6 @@
               :transactionCount="transactionCount"
               :transactionLinkCount="transactionLinkCount"
               :pending="pending"
-              :decayStartBlock="decayStartBlock"
               @update-transactions="updateTransactions"
               @set-tunneled-email="setTunneledEmail"
             ></router-view>
@@ -63,7 +62,6 @@ export default {
       transactionLinkCount: 0,
       pending: true,
       visible: false,
-      decayStartBlock: new Date(),
       tunneledEmail: null,
     }
   },
@@ -110,7 +108,6 @@ export default {
           this.balance = Number(transactionList.balance.balance)
           this.transactionCount = transactionList.balance.count
           this.transactionLinkCount = transactionList.balance.linkCount
-          this.decayStartBlock = new Date(transactionList.balance.decayStartBlock)
           this.pending = false
         })
         .catch((error) => {

frontend/src/pages/Overview.vue

@@ -18,7 +18,6 @@
         :transactions="transactions"
         :pageSize="5"
         :timestamp="timestamp"
-        :decayStartBlock="decayStartBlock"
         :transaction-count="transactionCount"
         :transactionLinkCount="transactionLinkCount"
         :pending="pending"
@@ -49,7 +48,6 @@ export default {
   props: {
     balance: { type: Number, default: 0 },
     GdtBalance: { type: Number, default: 0 },
-    decayStartBlock: { type: Date },
     transactions: {
       default: () => [],
     },

frontend/src/pages/Transactions.vue

@@ -10,7 +10,6 @@
           :transactionLinkCount="transactionLinkCount"
           :transactions="transactions"
           :show-pagination="true"
-          :decayStartBlock="decayStartBlock"
           @update-transactions="updateTransactions"
           v-on="$listeners"
         />
@@ -45,7 +44,6 @@ export default {
     },
     transactionCount: { type: Number, default: 0 },
     transactionLinkCount: { type: Number, default: 0 },
-    decayStartBlock: { type: Date },
   },
   data() {
     return {