Merge pull request #136 from eqlabs/latenssi/merge-onflow-main

Merge onflow main

.env.example

@@ -1,12 +1,32 @@
-ACCESS_API_HOST=localhost:3569
+ADMIN_ADDRESS=0xf8d6e0586b0a20c7
+ADMIN_PRIVATE_KEY=91a22fbd87392b019fbe332c32695c14cf2ba5b6521476a8540228bdf1987068
 
-DATABASE_DSN=postgresql://postgres:postgres@localhost:5432/postgres
 DATABASE_TYPE=psql
+DATABASE_DSN=postgresql://wallet:wallet@localhost:5432/wallet
 
-ADMIN_ADDRESS=0xf8d6e0586b0a20c7
-ADMIN_PRIVATE_KEY=be44c2dfdf72fdcc8da80d19dbedb0257042de28ceeea1836599a90d2c19a0da
+# emulator
+ACCESS_API_HOST=localhost:3569
 CHAIN_ID=flow-emulator
+
+# testnet
+# ACCESS_API_HOST=access.testnet.nodes.onflow.org:9000
+# CHAIN_ID=flow-testnet
+
+# mainnet
+# ACCESS_API_HOST=access.mainnet.nodes.onflow.org:9000
+# CHAIN_ID=flow-mainnet
+
+# When set to "local", private keys are generated by the API
+# and stored as encrypted text in the database.
 DEFAULT_KEY_TYPE=local
-ENCRYPTION_KEY=
 
-ENABLED_TOKENS=FlowToken:0x0ae53cb6e3f42a79:flowToken,FUSD:0xf8d6e0586b0a20c7:fusd
+# This symmetrical key is used to encrypt private keys
+# that are stored in the database.
+ENCRYPTION_KEY=faae4ed1c30f4e4555ee3a71f1044a8e
+
+ENABLED_TOKENS=FUSD:0xf8d6e0586b0a20c7:fusd,FlowToken:0x0ae53cb6e3f42a79:flowToken
+
+# This sets the number of proposal keys to be used on the admin account.
+# You can increase transaction throughput by using multiple proposal keys for
+# parallel transaction execution.
+ADMIN_PROPOSAL_KEY_COUNT=50

.env.test

@@ -0,0 +1,17 @@
+ADMIN_ADDRESS=0xf8d6e0586b0a20c7
+ADMIN_PRIVATE_KEY=91a22fbd87392b019fbe332c32695c14cf2ba5b6521476a8540228bdf1987068
+
+ACCESS_API_HOST=localhost:3569
+CHAIN_ID=flow-emulator
+
+# When set to "local", private keys are generated by the API
+# and stored as encrypted text in the database.
+DEFAULT_KEY_TYPE=local
+
+# This symmetrical key is used to encrypt private keys
+# that are stored in the database.
+ENCRYPTION_KEY=faae4ed1c30f4e4555ee3a71f1044a8e
+
+ENABLED_TOKENS=FUSD:0xf8d6e0586b0a20c7:fusd,FlowToken:0x0ae53cb6e3f42a79:flowToken
+
+ADMIN_PROPOSAL_KEY_COUNT=100

.gitignore

@@ -1,3 +1,121 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Snowpack dependency directory (https://snowpack.dev/)
+web_modules/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Microbundle cache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env*
+!.env.example
+!.env.test
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+.parcel-cache
+
+# Next.js build output
+.next
+out
+
+# Nuxt.js build / generate output
+.nuxt
+dist
+
+# Gatsby files
+.cache/
+# Comment in the public line in if your project uses Gatsby and not Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# TernJS port file
+.tern-port
+
+# Stores VSCode versions used for testing VSCode extensions
+.vscode-test
+
+# yarn v2
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.yarn/install-state.gz
+.pnp.*
+
 # Binaries for programs and plugins
 *.exe
 *.exe~
@@ -11,8 +129,6 @@
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
 
-.env*
-!.env.example
 *.db
 *.db-journal
 __debug_bin

COPYRIGHT_NOTICE

@@ -0,0 +1,13 @@
+   Copyright 2021 Equilibrium, OnFlow
+
+   This project is licensed under the Apache License, Version 2.0 (the "License");
+   you may not use the material in produced by this project except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.