Upgrade Google functions node version (#1864)

* Update gfunction deploy The node15 version will be unavailable January 30th 2024 * Update memberlist pure proxy * Fix bug in init proxy script * Use onfinality rpc instead of infura due to rate limitations --------- Co-authored-by: sophian <[email protected]>
centrifuge · Jan 19, 2024 · 1d4b120 · 1d4b120
1 parent 6d266f7
commit 1d4b120
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 5 deletions.
diff --git a/.github/actions/deploy-gfunction/action.yml b/.github/actions/deploy-gfunction/action.yml
@@ -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 }}'

diff --git a/centrifuge-app/.env-config/.env.altair b/centrifuge-app/.env-config/.env.altair
@@ -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

diff --git a/centrifuge-app/.env-config/.env.catalyst b/centrifuge-app/.env-config/.env.catalyst
@@ -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

diff --git a/centrifuge-app/.env-config/.env.demo b/centrifuge-app/.env-config/.env.demo
@@ -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

diff --git a/centrifuge-app/.env-config/.env.development b/centrifuge-app/.env-config/.env.development
@@ -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

diff --git a/centrifuge-app/.env-config/.env.example b/centrifuge-app/.env-config/.env.example
@@ -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

diff --git a/centrifuge-app/.env-config/.env.production b/centrifuge-app/.env-config/.env.production
@@ -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

diff --git a/centrifuge-app/declarations.d.ts b/centrifuge-app/declarations.d.ts
@@ -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
 }
diff --git a/centrifuge-app/src/config.ts b/centrifuge-app/src/config.ts
@@ -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

diff --git a/onboarding-api/env-vars/development.env b/onboarding-api/env-vars/development.env
@@ -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

diff --git a/onboarding-api/src/controllers/init/initProxies.ts b/onboarding-api/src/controllers/init/initProxies.ts
@@ -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(