Update real-fvr branch #109

Quicksaver · 2021-11-15T16:35:28Z

NOTE

~~Still WIP as we are finalizing thorough testing on our side, but~~ I'd appreciate your eyes going through the code in the meantime, to see if anything jumps up just by looking. ~~I will update this PR when testing on our side is finished before merging. So please don't merge until then as we don't want this in production just yet.~~ 😄

List of changes

updated with master
- brings it one step closer to start contributing functionalities to bepro-js
made a few tweaks to the watch and build steps to help with using a hot-localhost copy in our projects
committed yarn.lock for consistency across environments
removed hard lock on node minor version
- any v14 (LTS) node should be ok to use as minor versions don't (or shouldn't) include breaking changes
gas prices estimated from web3
- implemented gasFactor, gasAmount, gasPrice parameters applied to transactions
- __sendTx() now expects a second argument to override these values, hopefully I didn't add any compatibility issues with this
left both ERC721Contract and ERC721Standard - didn't want to mess with existing code that might depend with one or the other specifically, couldn't tell which was supposed to be "the one" overall
updated babel and eslint
- eslint is still not perfect as I couldn't get my IDE to work with it, but should provide cleaner code pre-commit as usual
- also follows updated standards
when initializing contracts, only start web3Connection if needed, but ensure it's started
I didn't run any tests as I don't have an eth network setup locally, probably broke a few?
Allow passing opt.provider to Web3Connection, with assumed connection logic (no need for internal start() or login())
- this allows us to leverage bepro-js through web3 wallets other than metamask
- a next step would be to implement specific wallet logic directly into bepro-js, as it already does for Metamask, but one step at a time 😄

-removed unused old file 'src/models/ERC20TokenLock' that was relocated somewhere else.

-file 'src/Web3Connection' for Web3 creation selecting the correct network, is based on old file src/Application.js -added a short tests file for Application class.

-removed all getContract functions from Application, and export each contract model ready for use. -src/models updated to use Web3Connection.js NOTE: src/IContract.js base class has the Web3Connection.js object to setup proper network.

-Tests were updated to match the new exported models. [BUGFIX] *This is related to issue 39: 'Each Test has to have its own ERC20Contract new deployment' this is on ganache local blockchain testing, so unit tests are isolated and tested clean and independent from anything else.

…o i19-rm-getcontract-func # resolved the following conflicts: # build/models/ERC20/ERC20Contract.js # build/models/ERC20/ERC20TokenLock.js # src/Application.js # src/models/ERC20/ERC20Contract.js # src/models/ERC20/ERC20TokenLock.js

-latest merge from master had a few conflicts left unresolved.

…o i19-rm-getcontract-func # resolved all conflicts: # build/Application.js # build/contracts/Address.json # build/contracts/BEPRONetwork.json # build/contracts/CappedToken.json # build/contracts/Context.json # build/contracts/ERC165.json # build/contracts/ERC20.json # build/contracts/ERC20Test.json # build/contracts/ERC20TokenLock.json # build/contracts/ERC721.json # build/contracts/ERC721Colectibles.json # build/contracts/ERC721Standard.json # build/contracts/EnumerableMap.json # build/contracts/EnumerableSet.json # build/contracts/Exchange.json # build/contracts/IERC165.json # build/contracts/IERC20.json # build/contracts/IERC721.json # build/contracts/IERC721Enumerable.json # build/contracts/IERC721Metadata.json # build/contracts/IERC721Receiver.json # build/contracts/Migrations.json # build/contracts/Opener.json # build/contracts/OpenerRealFvr.json # build/contracts/Ownable.json # build/contracts/Pausable.json # build/contracts/SafeMath.json # build/contracts/StakingContract.json # build/contracts/Strings.json # build/contracts/Token.json # build/contracts/_IERC20.json # build/models/BEPRO/Network.js # build/models/ERC20/ERC20Contract.js # build/models/ERC20/ERC20TokenLock.js # build/models/ERC721/ERC721Collectibles.js # build/models/ERC721/ERC721Standard.js # build/models/IContract.js # build/models/PredictionMarkets/ExchangeContract.js # build/models/Staking/StakingContract.js # index.js # src/Application.js # src/models/BEPRO/Network.js # src/models/ERC20/ERC20Contract.js # src/models/ERC20/ERC20TokenLock.js # src/models/ERC721/ERC721Collectibles.js # src/models/ERC721/ERC721Standard.js # src/models/IContract.js # src/models/Staking/StakingContract.js # tests/erc20Contract.js # tests/erc20TokenLock.js # tests/erc721Collectibles.js # tests/exchangeContract.js # tests/index.js # tests/stakingContract.js # xunit.xml

-fixed StakingContract constructor when creating ERC20Contract, give it the correct params.tokensAddress -fixed erc20TokenLock test bug when deploying ERC20TokenLock -fixed missing declaration for "erc20Contract" variable in stakingContract tests. [REFACTORY] -added "params" object in comments on all models wherever it was missing. -removed "mainnet" property from config object params when testing as latest code refactory made it obsolete.

…o i19-rm-getcontract-func

-added Web3Connection functions to IContract base model. [UPDATE] -added more nit tests for Application to assert proper functionalities. -updated README.md for new usage of package exported models.

-some code cleaning and improvements were made in tests files. [NEW] -added generic test file "tests/generics.js" for common behaviour found in all exported models. [UPDATES] -source file "src/Web3Connection.js" updated: -functions "start", "getETHNetwork", "getAddress" and "getETHBalance" were made normal from lambda (arrow). -function "_loadDataFromWeb3Connection" added in "src/models/IContract.js" file.

-function "start" was added back into "src/models/IContract.js" file. -fixed test from "tests/generics.js" file. -README file updated with small note on "start" function.

…o i19-rm-getcontract-func # Conflicts: # src/Application.js # src/models/BEPRO/Network.js # src/models/IContract.js # src/models/custom/RealFvr/OpenerRealFvr.js

Update Network.sol

…into real-fvr-luis

Real fvr luis

… exists

This reverts commit 29a2786.

This reverts commit 02c10a0.

…ng value exists" This reverts commit 6189049.

Review Update real-fvr branch #109 to merge with master

sgoia and others added 30 commits May 10, 2021 17:21

[REFACTORY]

e6eccb1

-removed unused old file 'src/models/ERC20TokenLock' that was relocated somewhere else.

[NEW / ADD + UPDATE + REFACTORY]

a83fc8b

-file 'src/Web3Connection' for Web3 creation selecting the correct network, is based on old file src/Application.js -added a short tests file for Application class.

[REFACTORY + UPDATE]

1fb8f03

-removed all getContract functions from Application, and export each contract model ready for use. -src/models updated to use Web3Connection.js NOTE: src/IContract.js base class has the Web3Connection.js object to setup proper network.

[last merge BUGFIX]

ceb8537

-latest merge from master had a few conflicts left unresolved.

[dummy] build files commit

ca5bb54

Merge branch 'master' of https://github.com/bepronetwork/bepro-js int…

d754eef

…o i19-rm-getcontract-func

[FIX]

24b3ad0

-added Web3Connection functions to IContract base model. [UPDATE] -added more nit tests for Application to assert proper functionalities. -updated README.md for new usage of package exported models.

[HOTFIX]

c3ae951

-function "start" was added back into "src/models/IContract.js" file. -fixed test from "tests/generics.js" file. -README file updated with small note on "start" function.

first commit

5ea6f16

Update Application.js

12520e1

add build to pre-commit

c13ef36

Merge branch 'master' of https://github.com/betprotocol/bepro-js

e734a45

add build to pre-commit

197c177

add new documentation

7847e7f

add new documentation

6359308

Merge branch 'master' of https://github.com/bepronetwork/bepro-js int…

9b3d6c4

…o i19-rm-getcontract-func # Conflicts: # src/Application.js # src/models/BEPRO/Network.js # src/models/IContract.js # src/models/custom/RealFvr/OpenerRealFvr.js

document IContract.js

282edb4

documents Network.js

822603d

fix a missing comma on Network.js

3d04ea8

nudges network, real5r and icontract

afffcad

I got tired of making a commit for each file ^^'

f882853

introduce a typedef example

fa1513f

check if we need {} on the return statement

9b3ed8c

add typedef to the more lengthy return types

3666348

adds logo to the jsdoc

efdf077

Quicksaver added 20 commits November 9, 2021 15:04

Add missing dependency

340d587

Fix build

86cc1b2

Ignore built flag

f1e4a0f

Merge pull request #1 from bepronetwork/master

99adac8

Update Network.sol

Merge branch 'real-fvr-luis' of https://github.com/RealFevr/bepro-js …

1d39526

…into real-fvr-luis

Only start web3Connection if needed, but ensure it does

3c9889b

Initialize ERC20 in MarketplaceRealFvr only if necessary

01c8aed

Nomenclature consistency

759b45e

Proper estimate gas + allow for gasFactor multiplier

f93ae03

Accept any web3 provider with assumed connection

28ae667

Cleanup

e2ca377

Bugfix use correct decimals in buy method

109e8c2

Bugfix estimateGas

a5832f4

Add balanceOf to ERC721Collectibles

6dad431

Merge pull request #2 from RealFevr/real-fvr-luis

04b5f60

Real fvr luis

Cleanup Readme

4ffa921

Update README.md

d8cc91d

Update README.md

2687599

Fix production build and upgrade dependencies

8429021

Implement nextGasLimit and nextGasPrice

86ec55d

Quicksaver changed the title ~~WIP: Update real-fvr branch~~ Update real-fvr branch Nov 25, 2021

Quicksaver added 8 commits November 26, 2021 18:14

Add ability to override gasAmount per transaction

cdc2578

Lint

10b49ef

Attempt compatibility with walletconnect web3 provider assuming value…

6189049

… exists

Apply previous bugfix to estimateGas as well

02c10a0

One more try at walletconnect compat

29a2786

Revert "One more try at walletconnect compat"

49ce509

This reverts commit 29a2786.

Revert "Apply previous bugfix to estimateGas as well"

66850dc

This reverts commit 02c10a0.

Revert "Attempt compatibility with walletconnect web3 provider assumi…

7549ee9

…ng value exists" This reverts commit 6189049.

moshmage added a commit that referenced this pull request May 1, 2022

Merge pull request #134 from Quicksaver/real-fvr-cleanup

eaec642

Review Update real-fvr branch #109 to merge with master

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update real-fvr branch #109

Update real-fvr branch #109

Quicksaver commented Nov 15, 2021 •

edited

Loading

Update real-fvr branch #109

Are you sure you want to change the base?

Update real-fvr branch #109

Conversation

Quicksaver commented Nov 15, 2021 • edited Loading

NOTE

List of changes

Quicksaver commented Nov 15, 2021 •

edited

Loading