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

Upgrade Google functions node version #1864

Merged
merged 6 commits into from
Jan 19, 2024
Merged

Upgrade Google functions node version #1864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d1e24ab
Update gfunction deploy
gpmayorga Jan 15, 2024
0ae23e3
Update memberlist pure proxy
sophialittlejohn Jan 16, 2024
c678147
Fix bug in init proxy script
sophialittlejohn Jan 16, 2024
43f9d0d
Merge branch 'main' into update-node-version-gfunctions
gpmayorga Jan 17, 2024
b66617e
Use onfinality rpc instead of infura due to rate limitations
sophialittlejohn Jan 19, 2024
322ffe4
Merge branch 'main' of github.com:centrifuge/apps into update-node-ve…
sophialittlejohn Jan 19, 2024
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
2 changes: 1 addition & 1 deletion .github/actions/deploy-gfunction/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ runs:
uses: google-github-actions/deploy-cloud-functions@14509ca55199d9348161571e36c48e44f855030d #@v1
with:
name: '${{ steps.prepare.outputs.function_name }}'
runtime: 'nodejs16'
runtime: 'nodejs18'
region: '${{ inputs.gcloud_region }}'
source_dir: '${{ steps.download.outputs.download-path }}'
entry_point: '${{ inputs.target }}'
Expand Down
1 change: 1 addition & 0 deletions centrifuge-app/.env-config/.env.altair
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ REACT_APP_SUBQUERY_URL=https://api.subquery.network/sq/centrifuge/pools-altair
REACT_APP_SUBSCAN_URL=https://altair.subscan.io
REACT_APP_TINLAKE_NETWORK=goerli
REACT_APP_INFURA_KEY=bf808e7d3d924fbeb74672d9341d0550
REACT_APP_ONFINALITY_KEY='0e1c049f-d876-4e77-a45f-b5afdf5739b2'
REACT_APP_WHITELISTED_ACCOUNTS=
REACT_APP_REWARDS_TREE_URL=https://storage.googleapis.com/rad-rewards-trees-kovan-staging/latest.json
REACT_APP_MEMBERLIST_ADMIN_PURE_PROXY=kALJqPUHFzDR2VkoQYWefPQyzjGzKznNny2smXGQpSf3aMw19
Expand Down
1 change: 1 addition & 0 deletions centrifuge-app/.env-config/.env.catalyst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ REACT_APP_SUBQUERY_URL=https://api.subquery.network/sq/centrifuge/pools-catalyst
REACT_APP_SUBSCAN_URL=
REACT_APP_TINLAKE_NETWORK=goerli
REACT_APP_INFURA_KEY=bf808e7d3d924fbeb74672d9341d0550
REACT_APP_ONFINALITY_KEY='0e1c049f-d876-4e77-a45f-b5afdf5739b2'
REACT_APP_WHITELISTED_ACCOUNTS=
REACT_APP_REWARDS_TREE_URL=https://storage.googleapis.com/rad-rewards-trees-kovan-staging/latest.json
REACT_APP_MEMBERLIST_ADMIN_PURE_PROXY=4bo2vNkwZtr2PuqppWwqya6dPC8MzxqZ4kgnAoTZyKo9Kxq8
Expand Down
1 change: 1 addition & 0 deletions centrifuge-app/.env-config/.env.demo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ REACT_APP_SUBQUERY_URL=https://api.subquery.network/sq/centrifuge/pools-demo
REACT_APP_SUBSCAN_URL=
REACT_APP_TINLAKE_NETWORK=goerli
REACT_APP_INFURA_KEY=bf808e7d3d924fbeb74672d9341d0550
REACT_APP_ONFINALITY_KEY='0e1c049f-d876-4e77-a45f-b5afdf5739b2'
REACT_APP_WHITELISTED_ACCOUNTS=
REACT_APP_NETWORK=centrifuge
REACT_APP_REWARDS_TREE_URL=https://storage.googleapis.com/rad-rewards-trees-kovan-staging/latest.json
Expand Down
1 change: 1 addition & 0 deletions centrifuge-app/.env-config/.env.development
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ REACT_APP_SUBQUERY_URL=https://api.subquery.network/sq/centrifuge/pools-centrifu
REACT_APP_SUBSCAN_URL=https://centrifuge.subscan.io
REACT_APP_TINLAKE_NETWORK=mainnet
REACT_APP_INFURA_KEY=bf808e7d3d924fbeb74672d9341d0550
REACT_APP_ONFINALITY_KEY='0e1c049f-d876-4e77-a45f-b5afdf5739b2'
REACT_APP_WHITELISTED_ACCOUNTS=''
REACT_APP_REWARDS_TREE_URL=https://storage.googleapis.com/rad-rewards-trees-mainnet-production/latest.json
REACT_APP_MEMBERLIST_ADMIN_PURE_PROXY=kALJqPUHFzDR2VkoQYWefPQyzjGzKznNny2smXGQpSf3aMw19
Expand Down
1 change: 1 addition & 0 deletions centrifuge-app/.env-config/.env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ REACT_APP_SUBQUERY_URL=https://api.subquery.network/sq/centrifuge/pools-developm
REACT_APP_SUBSCAN_URL=
REACT_APP_TINLAKE_NETWORK=goerli
REACT_APP_INFURA_KEY=bf808e7d3d924fbeb74672d9341d0550
REACT_APP_ONFINALITY_KEY=
REACT_APP_WHITELISTED_ACCOUNTS=''
REACT_APP_REWARDS_TREE_URL=https://storage.googleapis.com/rad-rewards-trees-kovan-staging/latest.json
REACT_APP_MEMBERLIST_ADMIN_PURE_PROXY=kALJqPUHFzDR2VkoQYWefPQyzjGzKznNny2smXGQpSf3aMw19
Expand Down
1 change: 1 addition & 0 deletions centrifuge-app/.env-config/.env.production
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ REACT_APP_SUBQUERY_URL=https://api.subquery.network/sq/centrifuge/pools-centrifu
REACT_APP_SUBSCAN_URL=https://centrifuge.subscan.io
REACT_APP_TINLAKE_NETWORK=mainnet
REACT_APP_INFURA_KEY=bf808e7d3d924fbeb74672d9341d0550
REACT_APP_ONFINALITY_KEY='84bb59f4-05cc-440b-8fd4-7917623a90c6'
REACT_APP_WHITELISTED_ACCOUNTS=''
REACT_APP_REWARDS_TREE_URL=https://storage.googleapis.com/rad-rewards-trees-mainnet-production/latest.json
REACT_APP_MEMBERLIST_ADMIN_PURE_PROXY=kALJqPUHFzDR2VkoQYWefPQyzjGzKznNny2smXGQpSf3aMw19
Expand Down
1 change: 1 addition & 0 deletions centrifuge-app/declarations.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@ interface ImportMetaEnv {
REACT_APP_ONBOARDING_API_URL: string
REACT_APP_TINLAKE_NETWORK: 'goerli' | 'mainnet'
REACT_APP_INFURA_KEY: string
REACT_APP_ONFINALITY_KEY: string
REACT_APP_WALLETCONNECT_ID: string
}
5 changes: 3 additions & 2 deletions centrifuge-app/src/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,18 +128,19 @@ const CENTRIFUGE: EnvironmentConfig = {
}

const ethNetwork = import.meta.env.REACT_APP_TINLAKE_NETWORK || 'mainnet'
const onfinalityKey = import.meta.env.REACT_APP_ONFINALITY_KEY

const goerliConfig = {
rpcUrl: `https://eth-goerli.api.onfinality.io/rpc?apikey=${onfinalityKey}`,
chainId: 5,
rpcUrl: 'https://goerli.infura.io/v3/f9ba987e8cb34418bb53cdbd4d8321b5',
poolRegistryAddress: '0x5ba1e12693dc8f9c48aad8770482f4739beed696',
tinlakeUrl: 'https://goerli.staging.tinlake.cntrfg.com/',
poolsHash: 'QmQe9NTiVJnVcb4srw6sBpHefhYieubR7v3J8ZriULQ8vB', // TODO: add registry to config and fetch poolHash
blockExplorerUrl: 'https://goerli.etherscan.io',
}
const mainnetConfig = {
rpcUrl: `https://eth.api.onfinality.io/rpc?apikey=${onfinalityKey}`,
chainId: 1,
rpcUrl: 'https://mainnet.infura.io/v3/ed5e0e19bcbc427cbf8f661736d44516',
poolRegistryAddress: '0x5ba1e12693dc8f9c48aad8770482f4739beed696',
tinlakeUrl: 'https://tinlake.centrifuge.io',
poolsHash: 'QmNvauf8E6TkUiyF1ZgtYtntHz335tCswKp2uhBH1fiui1', // TODO: add registry to config and fetch poolHash
Expand Down
2 changes: 1 addition & 1 deletion onboarding-api/env-vars/development.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
REDIRECT_URL=https://app-dev.k-f.dev
MEMBERLIST_ADMIN_PURE_PROXY=kAJ27w29x7gHM75xajP2yXVLjVBaKmmUTxHwgRuCoAcWaoEiz
MEMBERLIST_ADMIN_PURE_PROXY=kAN9JT23mFNjRt7nKHLie3QvhGjyXvRwkobRUixWHcBiFBQ9t
COLLATOR_WSS_URL=wss://fullnode.development.cntrfg.com
RELAY_WSS_URL=wss://fullnode-relay.development.cntrfg.com
INFURA_KEY=bf808e7d3d924fbeb74672d9341d0550
Expand Down
2 changes: 1 addition & 1 deletion onboarding-api/src/controllers/init/initProxies.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export const initProxiesController = async (req: Request, res: Response) => {
Id: pureProxyController.address,
},
{ ForeignAsset: 1 },
CurrencyBalance.fromFloat(100000, 12)
CurrencyBalance.fromFloat(100000, 6)
)

const proxiedControllerSubmittable = api.tx.proxy.proxy(
Expand Down
Loading