Skip to content

Commit

Permalink
Merge pull request #83 from valueinstrument/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
philipeachille authored Feb 10, 2023
2 parents 321a5a7 + b772c80 commit 4180bbf
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 10 deletions.
2 changes: 1 addition & 1 deletion graphql-firebase-entity-store/functions/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Firebase & GraphQL server for VI Alpha 3.5.3
* Firebase & GraphQL server for VI Alpha 3.5.4
*
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
const settings = {
floatEthAmount: 0.2,
floatTokenAmount: 0,
autoVerify: true,
txGasPriceMplr: 1.1, // used in managed tx
txIncGasPriceMplr: 1.3, // used in managed tx
txGasPriceMplr: 1.3, // used in managed tx
txIncGasPriceMplr: 1.8, // used in managed tx
verifyGasPriceMplr: 1.5, // used in verification
gasLimit: 2000000, // used in all tx
// gasPrice: 80, // in Gwei // x * 1e9 = Gwei
Expand Down Expand Up @@ -142,6 +143,18 @@ async function floatEth( which ) {
.then( function( receipt ) {
console.log( 'Float ETH Transaction Success' /* + JSON.stringify( receipt ) */ );

/*
* float token
* NOTE: private key must exist in namespace-database in auth doc
*/
if ( settings.floatTokenAmount ) {
managedTransaction( {
initiatorAddress: web3.eth.defaultAccount.toLowerCase(),
recipientAddress: which,
txTotal: settings.floatTokenAmount,
} );
}

/* auto verify */
if ( settings.autoVerify ) {
return verify( which );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ function dBInit( dbEnv ) {

const env = {

use: 'staging',
use: 'prod',

local: false, /* set to "true" to save data locally when running importer */

Expand Down
1 change: 1 addition & 0 deletions web-interface/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ local-notes_bu.md
pagekite.py
test-link-creation.js
puppeteer
humbilka
2 changes: 1 addition & 1 deletion web-interface/app/plugins/builds/vplugins.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion web-interface/app/vcore/builds/vcore.min.js

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions web-interface/app/vcore/src/v/v-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ const VConfig = ( function() { // eslint-disable-line no-unused-vars

const settings = {

appVersion: 'Alpha 3.5.3',
uploadVersion: '7',
appVersion: 'Alpha 3.5.4',
uploadVersion: '8',

entityLedger: VNetworkInit.entityLedger,
chatLedger: VNetworkInit.chatLedger,
Expand Down Expand Up @@ -103,7 +103,7 @@ const VConfig = ( function() { // eslint-disable-line no-unused-vars
joinVersion: 2,

subscribeToChainEvents: false,
balanceCheckInterval: 30, // in sec
balanceCheckInterval: 90, // in sec
demoContent: false, // set to 'true', then reload page once, then set to 'false'
defaultVerification: false,
update3BoxEntityStore: false,
Expand All @@ -130,7 +130,7 @@ const VConfig = ( function() { // eslint-disable-line no-unused-vars

goerli: {
network: 'Goerli Testnet',
contractAddress: '0xa540555ea07BF5fd5476717A94F52E48b86d4648',
contractAddress: '0xb0a869d670ba5a31B3c8642806Fcf2E94622c837', // new deployment
transactionFee: 3333, // Fallback, percentage taken from the signed amount to be burned, multiplied by 10 to the power of 2, e.g. 3333 for 33.33%
communityContribution: 200, // Fallback, Percentage taken from transactionFee before burned, to be credited to the communityContributionAccount, multiplied by 10 to the power of 2, e.g. 1000 for 10.00%
explorerTx: 'https://goerli.etherscan.io/tx/', // include trailing slash
Expand Down

0 comments on commit 4180bbf

Please sign in to comment.