Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Production Release #415

Merged
merged 5 commits into from
Mar 1, 2023
Merged

Production Release #415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
56919d8
Fix/review contracts 398 (#403)
Torresmorah Feb 13, 2023
2624af6
Fix/add translation to spanish (#405)
Torresmorah Feb 16, 2023
b5c9284
Fix/last tx users 335 (#406)
Torresmorah Feb 16, 2023
5820b0a
Feat/agree terms and conditions 332 (#417)
Torresmorah Feb 28, 2023
0117753
Fix/contracts conflicts (#419)
Torresmorah Mar 1, 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
6 changes: 3 additions & 3 deletions .env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# contracts
CONTRACTS_NETWORK_API=https://proton-testnet.eosio.cr
CONTRACTS_NETWORK_API=https://proton-testnet.edenia.cloud
CONTRACTS_AFFILIATE_ACCOUNT=affiliate
CONTRACTS_AFFILIATE_PASSWORD=PW...
CONTRACTS_AFFILIATE_ACTIVE_PUBLIC_KEY=EOS...
Expand Down Expand Up @@ -27,7 +27,7 @@ HASURA_GRAPHQL_ACTION_BASE_URL=http://hapi:9090
# hapi
HAPI_SERVER_PORT=9090
HAPI_SERVER_ADDRESS=hapi
HAPI_NETWORK_API=https://proton-testnet.eosio.cr
HAPI_NETWORK_API=https://proton-testnet.edenia.cloud
HAPI_NETWORK_CHAIN_ID=71ee83bcf52142d61019d95f9cc5427ba6a0d7ff8accd9e2088ae2abeaf3d3dd
HAPI_NETWORK_WALLET=http://wallet:9999
HAPI_HASURA_URL=http://hasura:8080/v1/graphql
Expand Down Expand Up @@ -56,7 +56,7 @@ REACT_APP_CHAIN_LOGO=https://test.earnproton.com/proton.png
REACT_APP_FOOTER_LINKS=[]
REACT_APP_UAL_APP_NAME=Proton Affiliate Program
REACT_APP_UAL_API_PROTOCOL=https
REACT_APP_UAL_API_HOST=proton-testnet.eosio.cr
REACT_APP_UAL_API_HOST=proton-testnet.edenia.cloud
REACT_APP_UAL_API_PORT=443
REACT_APP_UAL_CHAIN_ID=71ee83bcf52142d61019d95f9cc5427ba6a0d7ff8accd9e2088ae2abeaf3d3dd
REACT_APP_HASURA_URL=http://localhost:8080/v1/graphql
Expand Down
74 changes: 50 additions & 24 deletions .vscode/c_cpp_properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,51 @@
{
"configurations": [
{
"name": "Mac",
"includePath": [
"${workspaceFolder}/contracts/**",
"/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/**",
"/usr/local/opt/eosio.cdt/opt/eosio.cdt/include/**",
"/usr/local/opt/eosio.cdt/opt/eosio.cdt/include/eosiolib/contracts/**",
"/usr/local/opt/eosio.cdt/opt/eosio.cdt/include/eosiolib/core/**"
],
"defines": ["uint128_t=__uint128_t", "int128_t=__int128_t"],
"macFrameworkPath": [],
"compilerPath": "/usr/bin/clang++",
"cStandard": "c17",
"cppStandard": "c++17",
"intelliSenseMode": "macos-clang-x64",
"compilerArgs": [],
"browse": {
"limitSymbolsToIncludedHeaders": true
}
}
],
"version": 4
}
"configurations": [
{
"name": "Mac",
"includePath": [
"${workspaceFolder}/contracts/**",
"/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/**",
"/usr/local/opt/eosio.cdt/opt/eosio.cdt/include/**",
"/usr/local/opt/eosio.cdt/opt/eosio.cdt/include/eosiolib/contracts/**",
"/usr/local/opt/eosio.cdt/opt/eosio.cdt/include/eosiolib/core/**"
],
"defines": [
"uint128_t=__uint128_t",
"int128_t=__int128_t"
],
"macFrameworkPath": [],
"compilerPath": "/usr/bin/clang++",
"cStandard": "c17",
"cppStandard": "c++17",
"intelliSenseMode": "macos-clang-x64",
"compilerArgs": [],
"browse": {
"limitSymbolsToIncludedHeaders": true
}
},
{
"name": "Linux",
"includePath": [
"${workspaceFolder}/**",
"${workspaceFolder}/contracts/**",
"/usr/opt/eosio.cdt/1.8.1/include/**",
"/usr/opt/eosio.cdt/1.8.1/include/eosiolib/contracts/**",
"/usr/opt/eosio.cdt/1.8.1/include/eosiolib/core/**",
"/usr/opt/eosio.cdt/1.8.1/include/eosiolib/contracts/eosio/**"
],
"defines": [],
"cStandard": "c17",
"cppStandard": "c++17",
"intelliSenseMode": "linux-clang-x64",
"mergeConfigurations": false,
"browse": {
"path": [
"${workspaceFolder}/**"
],
"limitSymbolsToIncludedHeaders": true
},
"compilerPath": "/usr/bin/clang-cpp-9"
}
],
"version": 4
}
12 changes: 9 additions & 3 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,14 @@
"**/.pnp.*": true
},
"prettier.prettierPath": "./webapp/.yarn/sdks/prettier/index.js",
"eslint.workingDirectories": [
{
"mode": "auto"
}
],
"cSpell.enabled": true,
"cSpell.enableFiletypes": [
"markdown"
]
"cSpell.enableFiletypes": ["markdown"],
"[cpp]": {
"editor.defaultFormatter": "ms-vscode.cpptools",
}
}
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ Within this repository you will find the following directories and files:

### EOSIO Blockchain Integration

This project is being developed on the [Proton Testnet](https://proton-testnet.eosio.online/) using the [`affiliate`](https://proton-test.bloks.io/account/affiliate) smart contract account. The backend service is currently using [EOS Costa Rica's testnet API Node](https://proton-testnet.eosio.cr/v1/chain/get_info)
This project is being developed on the [Proton Testnet](https://proton-testnet.antelope.tools/) using the [`affiliate`](https://testnet.protonscan.io/account/affiliate) smart contract account. The backend service is currently using [EOS Costa Rica's testnet API Node](https://proton-testnet.edenia.cloud/v1/chain/get_info)

We use the [EOS JS](https://github.com/EOSIO/eosjs) javascript API for integration with EOSIO-based blockchain networks using EOSIO RPC API.

Expand Down
Loading