Next Release

.github/workflows/CI-CD.yml

@@ -6,6 +6,11 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
+       # Mongo is needed for running tests
+      - name: Start MongoDB
+        uses: supercharge/mongodb-github-action@1.3.0
+        with:
+          mongodb-version: 4.2
       - uses: actions/checkout@v1
       - name: Use Node.js
         uses: actions/setup-node@v1
@@ -15,12 +20,6 @@ jobs:
         run: npm ci
       - name: run linter
         run: npm run eslint
-
-      # Mongo is needed for running tests
-      - name: Start MongoDB
-        uses: supercharge/mongodb-github-action@1.3.0
-        with:
-          mongodb-version: 4.2
       - name: test
         run: npm run test
 
@@ -61,14 +60,13 @@ jobs:
           #          passphrase: ${{ secrets.PASSPHRASE }}
           privateKey: ${{ secrets.DEVELOP_PRIVATE_KEY}}
 
-      - name: beta deploy
+      - name: production deploy
         if: github.ref == 'refs/heads/master'
         uses: garygrossgarten/github-action-ssh@v0.6.4
         with:
-#          command: cd feathers-giveth-beta && git checkout master && git pull origin master && [[ -s $HOME/.nvm/nvm.sh ]] && . $HOME/.nvm/nvm.sh && nvm use 10  && npm ci &&  NODE_ENV=production ./node_modules/.bin/migrate-mongo up && npm run serve
           # pull images, restart docker, then remove unused docker images
-          command: cd feathers-giveth-beta && git checkout master && git pull origin master && docker-compose -f docker-compose-production.yml pull && docker-compose -f docker-compose-production.yml down && docker-compose -f docker-compose-production.yml up -d && docker image prune -a --force
-          host: ${{ secrets.BETA_HOST }}
-          username: ${{ secrets.BETA_USERNAME }}
+          command: cd feathers-giveth-trace && git checkout master && git pull origin master && docker-compose -f docker-compose-production.yml pull && docker-compose -f docker-compose-production.yml down && docker-compose -f docker-compose-production.yml up -d && docker image prune -a --force
+          host: ${{ secrets.PRODUCTION_HOST }}
+          username: ${{ secrets.PRODUCTION_USERNAME }}
           #          passphrase: ${{ secrets.PASSPHRASE }}
-          privateKey: ${{ secrets.BETA_PRIVATE_KEY}}
+          privateKey: ${{ secrets.PRODUCTION_PRIVATE_KEY}}

Dockerfile

@@ -12,6 +12,6 @@ RUN apk add --update alpine-sdk
 RUN apk add git python3
 RUN npm ci
 RUN npm i -g pm2
-RUN npm i -g migrate-mongo
+RUN npm i -g migrate-mongo@8.1.4
 CMD migrate-mongo up && pm2-runtime start ./src/index.js
 EXPOSE 3030

README.md

@@ -103,14 +103,6 @@ If the `ipfsApi` is a valid ipfs node that we can connect to, we will pin every
 
 ### Video Walkthrough
 Video tutorial walkthrough here: https://tinyurl.com/y9lx6jrl
-
-## Deploying
-
-1. Start a production server
-
-    ```
-    yarn serve
-    ```
 
 ## Scripts
 
@@ -159,30 +151,11 @@ make `isAdmin` field true, for your user in you local MongoDb
 
 ## Production
 
-We use pm2 to manage our production servers. You can start the server using the `yarn serve` cmd. You will need to create an `ecosystem.config.js` file with the following contents:
+We use docker-compose for orchestration of our docker containers in our production servers. 
+* make Make sure you have a file named `production.json` in config folder
+* Install docker and docker-compose on your server
+* run this command: `docker-compose -f docker-compose-production.yml up -d`
 
-```
-module.exports = {
-  /**
-   * Application configuration section
-   * http://pm2.keymetrics.io/docs/usage/application-declaration/
-   */
-  apps: [
-    // First application
-    {
-      name: 'feathers',
-      script: 'src/index.js',
-      log_date_format: 'YYYY-MM-DD HH:mm',
-      env: {
-        COMMON_VARIABLE: 'true',
-      },
-      env_production: {
-        NODE_ENV: 'production',
-      },
-    },
-  ],
-};
-```
 PS: It's good to see [Github Actions config](./.github/workflows/CI-CD.yml) to better understanding of deploy structure
 ## RSK
 
@@ -226,6 +199,13 @@ in config to `true`, then
 And then after logging in `localhost:5601` with user:`elastic`, password: `changeme`
 you can see the logs
 
+## Donations Diagram
+This diagram demonstrates how donations are created and how status will be changed, 
+if you want to edit diagram just change `https://mermaid.ink/img/` to `https://mermaid-js.github.io/mermaid-live-editor/edit/#` in below link
+
+A Solid arrow mean a new donation will be created after this action, and dotted arrows are used when existing donations are modified.
+[![](https://mermaid.ink/img/eyJjb2RlIjoiZ3JhcGggVERcbiAgICBEb25vcltEb25vcl0gPT0-fERvbmF0ZXwgR2l2ZXJQZW5kaW5nKEdpdmVyL1BlbmRpbmcpXG4gICAgR2l2ZXJQZW5kaW5nIC0uLT4gRG9uYXRlVGFyZ2V0e1RhcmdldH1cbiAgICBHaXZlclBlbmRpbmcgLS4tPiB8VHJhbnNhY3Rpb24gaXMgbWluZWR8IEdpdmVyQ29tbWl0dGVkKEdpdmVyL0NvbW1pdHRlZCkgXG4gICAgRG9uYXRlVGFyZ2V0ID09PiB8RG9uYXRlIHRvIHRyYWNlfCBUcmFjZVBlbmRpbmcoVHJhY2UvUGVuZGluZylcbiAgICBEb25hdGVUYXJnZXQgPT0-IHxEb25hdGUgdG8gY2FtcGFpZ258IENhbXBhaWduUGVuZGluZyhDYW1wYWlnbi9QZW5kaW5nKVxuICAgIERvbmF0ZVRhcmdldCA9PT4gfERvbmF0ZSB0byBDb21tdW5pdHl8IENvbW11bml0eVBlbmRpbmcoQ29tbXVuaXR5L1BlbmRpbmcpXG4gICAgVHJhY2VQZW5kaW5nIC0uLT4gfCBUcmFuc2FjdGlvbiBpcyBtaW5lZCB8IFRyYWNlQ29tbWl0dGVkKFRyYWNlL0NvbW1pdHRlZClcbiAgICBDb21tdW5pdHlQZW5kaW5nIC0uLT58VHJhbnNhY3Rpb24gaXMgbWluZWQgfCBDb21tdW5pdHlXYWl0aW5nKENvbW11bml0eS9XYWl0aW5nKVxuICAgIENhbXBhaWduUGVuZGluZyAtLi0-IHxUcmFuc2FjdGlvbiBpcyBtaW5lZCB8Q2FtcGFpZ25Db21taXR0ZWQoQ2FtcGFpZ24vQ29taXR0ZWQpXG4gICAgVHJhY2VDb21taXR0ZWQgLS4tPnxDb2xsZWN0L0Rpc2J1cnNlfCBEZWNpc2lvbntUcmFjZSByZWNpcGllbnQgaXMgY2FtcGFpZ259XG4gICAgQ2FtcGFpZ25Db21taXR0ZWQgPT0-fERlbGVnYXRlIHRvIHRyYWNlfCBUcmFjZUNvbW1pdHRlZFxuICAgIENhbXBhaWduQ29tbWl0dGVkIC0uLT4gfENhbmNlbCBjYW1wYWlnbnxDYW1wYWlnbkNhbmNlbGxlZHtDYW1wYWlnbi9DYW5jZWxsZWR9XG4gICAgQ2FtcGFpZ25DYW5jZWxsZWQgPT0-IHxDb21tdW5pdHkgaXMgZG9uYXRpb24gcGFyZW50IG93bmVyfCBDb21tdW5pdHlXYWl0aW5nXG4gICAgQ2FtcGFpZ25DYW5jZWxsZWQgPT0-IHxEb25hdGlvbiBjb21lcyBmcm9tIGRpcmVjdCBkb25hdGlvbnwgR2l2ZXJDb21taXR0ZWRcbiAgICBEZWNpc2lvbiA9PT58Tm98IFBheWluZ1xuICAgIERlY2lzaW9uID09PnxZZXN8IENhbXBhaWduQ29tbWl0dGVkXG4gICAgUGF5aW5nID09PiBQYWlkXG4gICAgUGFpZCAtLi0-IEJyaWRnZVxuICAgIEJyaWRnZSAtLi0-IHxBdXRob3JpemVQYXltZW50ICYgUGF5bWVudEV4ZWN1dGVkfCBNYWluTmV0V2FsbGV0KE1haW5uZXQgV2FsbGV0KVxuICAgIENvbW11bml0eVdhaXRpbmcgPT0-IHxkZWxlZ2F0ZSB0byBjYW1wYWlnbiBvciB0cmFjZXwgVG9BcHByb3Zle1RvQXBwcm92ZX1cbiAgICBUb0FwcHJvdmUgLS4tPiB8RG9ub3IgY29uZmlybSB0cmFjZSBkZWxlZ2F0aW9ufCBUcmFjZUNvbW1pdHRlZFxuICAgIFRvQXBwcm92ZSAtLi0-IHxEb25vciBjb25maXJtIGNhbXBhaWduIGRlbGVnYXRpb258IENhbXBhaWduQ29tbWl0dGVkXG4gICAgVG9BcHByb3ZlIC0uLT4gfFJlamVjdCBieSBkb25vciBpbiAzIGRheXN8IENvbW11bml0eVJlamVjdGVkKENvbW11bml0eS9SZWplY3RlZClcbiAgICBDb21tdW5pdHlSZWplY3RlZCA9PT4gIHxOZXcgZG9uYXRpb24gaXMgcmVhZHkgdG8gZGVsZWdhdGUgbm93fENvbW11bml0eVdhaXRpbmdcbiAgICBUcmFjZUNvbW1pdHRlZCAtLi0-IHxDYW5jZWwgdHJhY2V8VHJhY2VDYW5jZWxlZHtUcmFjZS9DYW5jZWxlZH1cbiAgICBUcmFjZUNhbmNlbGVkID09PnxEb25hdGlvbiBjb21lcyBmcm9tIGNvbW11bml0eXwgQ29tbXVuaXR5V2FpdGluZ1xuICAgIFRyYWNlQ2FuY2VsZWQgPT0-ICB8Q2FtcGFpZ24gaXMgZG9uYXRpb24gcGFyZW50IG93bmVyfENhbXBhaWduQ29tbWl0dGVkXG4gICAgVHJhY2VDYW5jZWxlZCA9PT4gIHxEb25hdGlvbiBjb21lcyBmcm9tIERpcmVjdCBkb25hdGlvbnN8R2l2ZXJDb21taXR0ZWRcbiAgICAiLCJtZXJtYWlkIjp7InRoZW1lIjoiZGVmYXVsdCJ9LCJ1cGRhdGVFZGl0b3IiOmZhbHNlLCJhdXRvU3luYyI6dHJ1ZSwidXBkYXRlRGlhZ3JhbSI6ZmFsc2V9)](https://mermaid-js.github.io/mermaid-live-editor/edit/##eyJjb2RlIjoiZ3JhcGggVERcbiAgICBEb25vcltEb25vcl0gPT0-fERvbmF0ZXwgR2l2ZXJQZW5kaW5nKEdpdmVyL1BlbmRpbmcpXG4gICAgR2l2ZXJQZW5kaW5nIC0uLT4gRG9uYXRlVGFyZ2V0e1RhcmdldH1cbiAgICBHaXZlclBlbmRpbmcgLS4tPiB8VHJhbnNhY3Rpb24gaXMgbWluZWR8IEdpdmVyQ29tbWl0dGVkKEdpdmVyL0NvbW1pdHRlZCkgXG4gICAgRG9uYXRlVGFyZ2V0ID09PiB8RG9uYXRlIHRvIHRyYWNlfCBUcmFjZVBlbmRpbmcoVHJhY2UvUGVuZGluZylcbiAgICBEb25hdGVUYXJnZXQgPT0-IHxEb25hdGUgdG8gY2FtcGFpZ258IENhbXBhaWduUGVuZGluZyhDYW1wYWlnbi9QZW5kaW5nKVxuICAgIERvbmF0ZVRhcmdldCA9PT4gfERvbmF0ZSB0byBDb21tdW5pdHl8IENvbW11bml0eVBlbmRpbmcoQ29tbXVuaXR5L1BlbmRpbmcpXG4gICAgVHJhY2VQZW5kaW5nIC0uLT4gfCBUcmFuc2FjdGlvbiBpcyBtaW5lZCB8IFRyYWNlQ29tbWl0dGVkKFRyYWNlL0NvbW1pdHRlZClcbiAgICBDb21tdW5pdHlQZW5kaW5nIC0uLT58VHJhbnNhY3Rpb24gaXMgbWluZWQgfCBDb21tdW5pdHlXYWl0aW5nKENvbW11bml0eS9XYWl0aW5nKVxuICAgIENhbXBhaWduUGVuZGluZyAtLi0-IHxUcmFuc2FjdGlvbiBpcyBtaW5lZCB8Q2FtcGFpZ25Db21taXR0ZWQoQ2FtcGFpZ24vQ29taXR0ZWQpXG4gICAgVHJhY2VDb21taXR0ZWQgLS4tPnxDb2xsZWN0L0Rpc2J1cnNlfCBEZWNpc2lvbntUcmFjZSByZWNpcGllbnQgaXMgY2FtcGFpZ259XG4gICAgQ2FtcGFpZ25Db21taXR0ZWQgPT0-fERlbGVnYXRlIHRvIHRyYWNlfCBUcmFjZUNvbW1pdHRlZFxuICAgIENhbXBhaWduQ29tbWl0dGVkIC0uLT4gfENhbmNlbCBjYW1wYWlnbnxDYW1wYWlnbkNhbmNlbGxlZHtDYW1wYWlnbi9DYW5jZWxsZWR9XG4gICAgQ2FtcGFpZ25DYW5jZWxsZWQgPT0-IHxDb21tdW5pdHkgaXMgZG9uYXRpb24gcGFyZW50IG93bmVyfCBDb21tdW5pdHlXYWl0aW5nXG4gICAgQ2FtcGFpZ25DYW5jZWxsZWQgPT0-IHxEb25hdGlvbiBjb21lcyBmcm9tIGRpcmVjdCBkb25hdGlvbnwgR2l2ZXJDb21taXR0ZWRcbiAgICBEZWNpc2lvbiA9PT58Tm98IFBheWluZ1xuICAgIERlY2lzaW9uID09PnxZZXN8IENhbXBhaWduQ29tbWl0dGVkXG4gICAgUGF5aW5nID09PiBQYWlkXG4gICAgUGFpZCAtLi0-IEJyaWRnZVxuICAgIEJyaWRnZSAtLi0-IHxBdXRob3JpemVQYXltZW50ICYgUGF5bWVudEV4ZWN1dGVkfCBNYWluTmV0V2FsbGV0KE1haW5uZXQgV2FsbGV0KVxuICAgIENvbW11bml0eVdhaXRpbmcgPT0-IHxkZWxlZ2F0ZSB0byBjYW1wYWlnbiBvciB0cmFjZXwgVG9BcHByb3Zle1RvQXBwcm92ZX1cbiAgICBUb0FwcHJvdmUgLS4tPiB8RG9ub3IgY29uZmlybSB0cmFjZSBkZWxlZ2F0aW9ufCBUcmFjZUNvbW1pdHRlZFxuICAgIFRvQXBwcm92ZSAtLi0-IHxEb25vciBjb25maXJtIGNhbXBhaWduIGRlbGVnYXRpb258IENhbXBhaWduQ29tbWl0dGVkXG4gICAgVG9BcHByb3ZlIC0uLT4gfFJlamVjdCBieSBkb25vciBpbiAzIGRheXN8IENvbW11bml0eVJlamVjdGVkKENvbW11bml0eS9SZWplY3RlZClcbiAgICBDb21tdW5pdHlSZWplY3RlZCA9PT4gIHxOZXcgZG9uYXRpb24gaXMgcmVhZHkgdG8gZGVsZWdhdGUgbm98Q29tbXVuaXR5V2FpdGluZ1xuICAgIFRyYWNlQ29tbWl0dGVkIC0uLT4gfENhbmNlbCB0cmFjZXxUcmFjZUNhbmNlbGVke1RyYWNlL0NhbmNlbGVkfVxuICAgIFRyYWNlQ2FuY2VsZWQgPT0-fERvbmF0aW9uIGNvbWVzIGZyb20gY29tbXVuaXR5fCBDb21tdW5pdHlXYWl0aW5nXG4gICAgVHJhY2VDYW5jZWxlZCA9PT4gIHxDYW1wYWlnbiBpcyBkb25hdGlvbiBwYXJlbnQgb3duZXJ8Q2FtcGFpZ25Db21taXR0ZWRcbiAgICBUcmFjZUNhbmNlbGVkID09PiAgfERvbmF0aW9uIGNvbWVzIGZyb20gRGlyZWN0IGRvbmF0aW9uc3xHaXZlckNvbW1pdHRlZFxuICAgICIsIm1lcm1haWQiOiJ7XG4gIFwidGhlbWVcIjogXCJkZWZhdWx0XCJcbn0iLCJ1cGRhdGVFZGl0b3IiOmZhbHNlLCJhdXRvU3luYyI6dHJ1ZSwidXBkYXRlRGlhZ3JhbSI6ZmFsc2V9)
+
 ## Help
 
 For more info on how to work with feathers checkout out their docs on [service methods](https://docs.feathersjs.com/api/databases/common.html#service-methods), [service events](https://docs.feathersjs.com/api/events.html#service-events), and [database querying](https://docs.feathersjs.com/api/databases/querying.html).

config/default.json

@@ -190,7 +190,8 @@
     "createDonationTtlSeconds":3600,
     "createDonationThreshold":300,
     "createAuthenticationTtlSeconds":60,
-    "createAuthenticationThreshold":10
+    "createAuthenticationThreshold":10,
+    "whitelist": []
   },
   "givethIoUrl": "https://serve.giveth.io/graphql",
   "givethIoProjectsReviewerAddress": "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1"

migrations/20210817105739-change-donations-to-campaign-is-return-if-needed.js

@@ -0,0 +1,42 @@
+const { ObjectID } = require('mongodb');
+
+const findParentDonation = (db, parentDonations) => {
+  if (parentDonations.length === 0) {
+    return undefined;
+  }
+  return db.collection('donations').findOne({ _id: ObjectID(parentDonations[0]) });
+};
+module.exports = {
+  async up(db, _client) {
+    const cursor = await db
+      .collection('donations')
+      .find({ ownerType: 'campaign', status: 'Committed', mined: true, isReturn: false });
+    console.log('updated donations :');
+    // eslint-disable-next-line no-restricted-syntax
+    for await (const donation of cursor) {
+      const { ownerTypeId, parentDonations } = donation;
+      const parentDonation = await findParentDonation(db, parentDonations);
+      // console.log('donations', { donation, parentDonation });
+
+      if (!parentDonation || !['Paid', 'Committed'].includes(parentDonation.status)) {
+        // eslint-disable-next-line no-continue
+        continue;
+      }
+      const grandParentDonation = await findParentDonation(db, parentDonation.parentDonations);
+      if (
+        grandParentDonation &&
+        grandParentDonation.status === 'Committed' &&
+        grandParentDonation.ownerType === 'campaign' &&
+        grandParentDonation.ownerTypeId === ownerTypeId
+      ) {
+        // in this case we know that money went from campaign to  a trace, the recipient of
+        // that trace is very campaign, so after disbursing (withdraw), the money go back to campaign
+        console.log(String(donation._id));
+        db.collection('donations').updateOne({ _id: donation._id }, { $set: { isReturn: true } });
+      }
+    }
+  },
+
+  // eslint-disable-next-line no-empty-function
+  async down(_db, _client) {},
+};