Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
023a736
added WIP support for the redemption of multiple tokens from a single…
gtaschuk Nov 3, 2020
2ccfb0c
updated readme
gtaschuk Jul 5, 2021
d11ad41
added config for arbitrum (BAL)
gtaschuk Sep 14, 2021
b5a2ec0
added merkleredeem contract address
gtaschuk Sep 14, 2021
c71b78b
added vita config
gtaschuk Sep 20, 2021
fb802f2
added deployed address
gtaschuk Sep 21, 2021
d450d21
add weeks offsets
markusbkoch Oct 1, 2021
744852e
fix ldo repors url
markusbkoch Oct 1, 2021
fe2e7c7
parameterize url in claimed table
markusbkoch Oct 1, 2021
227e56e
parameterize report filename
markusbkoch Oct 1, 2021
06d415a
added config for pickle distributions on arbitrum
gtaschuk Oct 5, 2021
a43b09d
specify a latest week in config for migration to merkle orchard, use …
gtaschuk Oct 18, 2021
660366d
added a banner for when a contract has been migrated to the orchard
gtaschuk Oct 18, 2021
82b7851
set latest week for arbitrum
gtaschuk Oct 18, 2021
6e28258
cap weeks to reflect MerkleRedeem migration to MerkleOrchard
gtaschuk Oct 26, 2021
396b422
Remove VITA week cap
markusbkoch Nov 11, 2021
e6af0e4
allow a week to be omitted in the caso of an invalid root being submi…
gtaschuk Jan 4, 2022
34213ee
set latestWeek to 13 to allow more claims
gtaschuk Jan 4, 2022
9a576fa
filter out omitted weeks from user view entirely
gtaschuk Jan 4, 2022
9d8481c
Bump pathval from 1.1.0 to 1.1.1 in /merkle
dependabot[bot] Feb 11, 2022
b238806
Bump node-sass from 4.14.1 to 7.0.0 in /client
dependabot[bot] Feb 11, 2022
94d952e
Bump ajv from 6.12.2 to 6.12.6 in /client
dependabot[bot] Feb 14, 2022
49c078f
Bump url-parse from 1.4.7 to 1.5.10 in /client
dependabot[bot] Feb 27, 2022
d43c6b2
Bump minimist from 1.2.5 to 1.2.6 in /client
dependabot[bot] Mar 31, 2022
c2761fb
Bump eventsource from 1.0.7 to 1.1.1 in /client
dependabot[bot] Jun 1, 2022
2d2d765
my stack
Getrichordietryng Jun 9, 2022
32afc35
Create stale.yml
Getrichordietryng Jun 10, 2022
9a0d181
Add .circleci/config.yml
Getrichordietryng Jun 10, 2022
ee45ec5
Delete stale.yml
Getrichordietryng Jun 10, 2022
23484c3
Create azure-container-webapp.yml
Getrichordietryng Jun 10, 2022
e535674
Bump node-fetch from 2.6.1 to 2.6.7 in /merkle
dependabot[bot] Jun 25, 2022
2ad1411
Bump thenify from 3.3.0 to 3.3.1 in /client
dependabot[bot] Jul 18, 2022
c6881ca
Bump terser from 4.7.0 to 4.8.1 in /client
dependabot[bot] Jul 21, 2022
6237282
Bump @openzeppelin/contracts from 3.1.0 to 4.7.2 in /merkle
dependabot[bot] Aug 14, 2022
71ebf07
Bump minimatch from 3.0.4 to 3.0.8 in /client
dependabot[bot] Nov 12, 2022
201dda1
Bump decode-uri-component from 0.2.0 to 0.2.2 in /merkle
dependabot[bot] Dec 7, 2022
4de302b
Bump decode-uri-component from 0.2.0 to 0.2.2 in /client
dependabot[bot] Dec 7, 2022
965c780
Bump qs from 6.5.2 to 6.5.3 in /merkle
dependabot[bot] Dec 11, 2022
456597a
Bump express from 4.17.1 to 4.18.2 in /merkle
dependabot[bot] Dec 13, 2022
3b4d771
Bump express from 4.17.1 to 4.18.2 in /client
dependabot[bot] Dec 14, 2022
9025ffe
Merge branch 'arbitrum-pickle'
Getrichordietryng Apr 4, 2023
89ec1af
Merge branch 'master' into dependabot/npm_and_yarn/client/ajv-6.12.6
Getrichordietryng Apr 4, 2023
bc2a5c4
Merge remote-tracking branch 'upstream/dependabot/npm_and_yarn/client…
Getrichordietryng Apr 4, 2023
3f2be56
Merge remote-tracking branch 'origin/multiple-tokens' into dependabot…
Getrichordietryng Apr 4, 2023
27eb787
Merge branch 'circleci-project-setup' into dependabot/npm_and_yarn/cl…
Getrichordietryng Apr 4, 2023
c55f604
Merge remote-tracking branch 'upstream/dependabot/npm_and_yarn/client…
Getrichordietryng Apr 4, 2023
dbda2be
Merge remote-tracking branch 'upstream/dependabot/npm_and_yarn/client…
Getrichordietryng Apr 4, 2023
bf8fa70
Merge remote-tracking branch 'upstream/dependabot/npm_and_yarn/merkle…
Getrichordietryng Apr 4, 2023
b18e222
Merge branch 'master' into dependabot/npm_and_yarn/client/minimatch-3…
Getrichordietryng Apr 4, 2023
494022c
Merge remote-tracking branch 'origin/my-stack'
Getrichordietryng Apr 4, 2023
94c03c0
Merge branch 'bal-arbitrum'
Getrichordietryng Apr 4, 2023
b899bc2
Merge branch 'dependabot/npm_and_yarn/client/minimatch-3.0.8'
Getrichordietryng Apr 4, 2023
e0ceb88
Merge branch 'dependabot/npm_and_yarn/client/ajv-6.12.6'
Getrichordietryng Apr 4, 2023
e8c8fc7
Merge branch 'filter-out-orchard'
Getrichordietryng Apr 4, 2023
7c5e81a
Merge branch 'latest-weeks'
Getrichordietryng Apr 4, 2023
fec8221
Merge remote-tracking branch 'origin/latestWeekInContract'
Getrichordietryng Apr 4, 2023
a9f043a
Merge remote-tracking branch 'origin/links-fixing'
Getrichordietryng Apr 4, 2023
814776f
Merge remote-tracking branch 'origin/readme'
Getrichordietryng Apr 4, 2023
fbe3913
Merge remote-tracking branch 'origin/vita'
Getrichordietryng Apr 4, 2023
5ad068b
Merge remote-tracking branch 'upstream/dependabot/npm_and_yarn/client…
Getrichordietryng Apr 4, 2023
f387594
Merge remote-tracking branch 'upstream/dependabot/npm_and_yarn/client…
Getrichordietryng Apr 4, 2023
1a435f4
Merge remote-tracking branch 'upstream/dependabot/npm_and_yarn/client…
Getrichordietryng Apr 4, 2023
6009bd4
Merge remote-tracking branch 'upstream/dependabot/npm_and_yarn/merkle…
Getrichordietryng Apr 4, 2023
428ecbe
Merge remote-tracking branch 'upstream/dependabot/npm_and_yarn/client…
Getrichordietryng Apr 4, 2023
6dead87
Merge remote-tracking branch 'upstream/dependabot/npm_and_yarn/merkle…
Getrichordietryng Apr 4, 2023
7ca2daa
Merge remote-tracking branch 'upstream/dependabot/npm_and_yarn/merkle…
Getrichordietryng Apr 4, 2023
93d482a
Merge remote-tracking branch 'upstream/omitVitaWeek'
Getrichordietryng Apr 4, 2023
4d260e0
Merge remote-tracking branch 'upstream/vita-patch'
Getrichordietryng Apr 4, 2023
c546478
Merge remote-tracking branch 'upstream/dependabot/npm_and_yarn/merkle…
Getrichordietryng Apr 4, 2023
89d5356
Merge remote-tracking branch 'upstream/dependabot/npm_and_yarn/merkle…
Getrichordietryng Apr 4, 2023
3974bef
Merge remote-tracking branch 'upstream/dependabot/npm_and_yarn/client…
Getrichordietryng Apr 4, 2023
61a79ae
Merge remote-tracking branch 'upstream/dependabot/npm_and_yarn/client…
Getrichordietryng Apr 4, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 20 additions & 30 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,36 +1,26 @@
version: 2
# Use the latest 2.1 version of CircleCI pipeline process engine.
# See: https://circleci.com/docs/2.0/configuration-reference
version: 2.1

# Define a job to be invoked later in a workflow.
# See: https://circleci.com/docs/2.0/configuration-reference/#jobs
jobs:
build:
say-hello:
# Specify the execution environment. You can specify an image from Dockerhub or use one of our Convenience Images from CircleCI's Developer Hub.
# See: https://circleci.com/docs/2.0/configuration-reference/#docker-machine-macos-windows-executor
docker:
- image: circleci/node:10.13.0
- image: cimg/base:stable
# Add steps to the job
# See: https://circleci.com/docs/2.0/configuration-reference/#steps
steps:
- checkout
- restore_cache:
keys:
- v1-dependencies-{{ checksum "~/project/merkle/package.json" }}
- v1-dependencies-
- run: cd ~/project/merkle && yarn
- save_cache:
paths:
- merkle/node_modules
key: v1-dependencies-{{ checksum "~/project/merkle/package.json" }}
test:
docker:
- image: circleci/node:10.13.0
- image: trufflesuite/ganache-cli:v6.10.1
command: ganache-cli --mnemonic "album wire record stuff abandon mesh museum piece bean allow refuse below"
steps:
- checkout
- restore_cache:
keys:
- v1-dependencies-{{ checksum "package.json" }}
- v1-dependencies
- run: cd ~/project/merkle && npm run test
- run:
name: "Say hello"
command: "echo Hello, World!"

# Invoke jobs via workflows
# See: https://circleci.com/docs/2.0/configuration-reference/#workflows
workflows:
version: 2
build_test:
say-hello-workflow:
jobs:
- build
- test:
requires:
- build
- say-hello
87 changes: 87 additions & 0 deletions .github/workflows/azure-container-webapp.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
# This workflow will build and push a Docker container to an Azure Web App when a commit is pushed to your default branch.
#
# This workflow assumes you have already created the target Azure App Service web app.
# For instructions see https://docs.microsoft.com/en-us/azure/app-service/quickstart-custom-container?tabs=dotnet&pivots=container-linux
#
# To configure this workflow:
#
# 1. Download the Publish Profile for your Azure Web App. You can download this file from the Overview page of your Web App in the Azure Portal.
# For more information: https://docs.microsoft.com/en-us/azure/app-service/deploy-github-actions?tabs=applevel#generate-deployment-credentials
#
# 2. Create a secret in your repository named AZURE_WEBAPP_PUBLISH_PROFILE, paste the publish profile contents as the value of the secret.
# For instructions on obtaining the publish profile see: https://docs.microsoft.com/azure/app-service/deploy-github-actions#configure-the-github-secret
#
# 3. Create a GitHub Personal access token with "repo" and "read:packages" permissions.
#
# 4. Create three app settings on your Azure Web app:
# DOCKER_REGISTRY_SERVER_URL: Set this to "https://ghcr.io"
# DOCKER_REGISTRY_SERVER_USERNAME: Set this to the GitHub username or organization that owns the repository
# DOCKER_REGISTRY_SERVER_PASSWORD: Set this to the value of your PAT token from the previous step
#
# 5. Change the value for the AZURE_WEBAPP_NAME.
#
# For more information on GitHub Actions for Azure: https://github.com/Azure/Actions
# For more information on the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
# For more samples to get started with GitHub Action workflows to deploy to Azure: https://github.com/Azure/actions-workflow-samples

name: Build and deploy a container to an Azure Web App

env:
AZURE_WEBAPP_NAME: your-app-name # set this to the name of your Azure Web App

on:
push:
branches:
- "master"
workflow_dispatch:

permissions:
contents: read

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1

- name: Log in to GitHub container registry
uses: docker/login-action@v1.10.0
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ github.token }}

- name: Lowercase the repo name and username
run: echo "REPO=${GITHUB_REPOSITORY,,}" >>${GITHUB_ENV}

- name: Build and push container image to registry
uses: docker/build-push-action@v2
with:
push: true
tags: ghcr.io/${{ env.REPO }}:${{ github.sha }}
file: ./Dockerfile

deploy:
permissions:
contents: none
runs-on: ubuntu-latest
needs: build
environment:
name: 'Development'
url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}

steps:
- name: Lowercase the repo name and username
run: echo "REPO=${GITHUB_REPOSITORY,,}" >>${GITHUB_ENV}

- name: Deploy to Azure Web App
id: deploy-to-webapp
uses: azure/webapps-deploy@v2
with:
app-name: ${{ env.AZURE_WEBAPP_NAME }}
publish-profile: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE }}
images: 'ghcr.io/${{ env.REPO }}:${{ github.sha }}'
Loading