From 0ec22ac3fed4a3760e0484f86eb97af2fa44c032 Mon Sep 17 00:00:00 2001 From: Bourdelas Pablo Date: Thu, 21 Apr 2022 14:36:15 +0200 Subject: [PATCH] chore: clean up --- .env | 3 - .gitignore | 3 +- .nxignore | 2 - cast.code-workspace | 9 +- docker-compose.yml | 4 +- docs/fro/04_createEMTN_variables_TEZOS.json | 12 +- ...itiateSubscription_variables_ETHEREUM.json | 6 +- ..._initiateSubscription_variables_TEZOS.json | 6 +- ...tTransferred_variables_with_comments.hjson | 2 +- ...ents.png => cast-ecosystem-components.png} | Bin .../{bondEmission.md => bondIssuance.md} | 8 +- mkdocs/mkdocs.yml | 2 +- networks/local/.gitignore | 2 + networks/local/env.liquid | 2 +- networks/local/ethereum/keys.json.liquid | 2 +- networks/local/tezos/keys.json.liquid | 2 +- networks/testnet/ethereum/keys.json.liquid | 2 +- networks/testnet/tezos/keys.json.liquid | 2 +- .../sonar-project.properties | 10 - .../scripts/toolchain/cli/platform.ts | 2 +- .../cast/cast-tz-v1/scripts/toolchain/type.ts | 2 +- .../cast-tz-v1/scripts/toolchain/utils.ts | 2 +- .../cast/chain-auth/sonar-project.properties | 10 - packages/cast/chain-auth/src/auth.ts | 4 +- packages/cast/chain-auth/src/jws.ts | 10 +- packages/cast/chain-auth/src/tokenUtils.ts | 10 +- packages/cast/chain-auth/src/types.ts | 4 +- packages/cast/chain-auth/tests/auth.spec.ts | 4 +- packages/cast/chain-auth/tests/jws.spec.ts | 6 +- packages/cast/models/src/models/index.ts | 1 - .../src/models/instrument-position/helpers.ts | 2 +- .../instrument-position.ts | 2 +- .../models/src/models/instruments/emtn.ts | 1 - .../src/models/instruments/instrument.ts | 2 +- .../models/src/models/operations/constants.ts | 48 ---- .../models/src/models/operations/index.ts | 1 - .../settlement-transactions/constants.ts | 27 +++ .../models/settlement-transactions/helpers.ts | 2 +- .../operation-input.ts | 4 +- .../settlement-transaction.ts | 2 +- .../oracle-clients/sonar-project.properties | 10 - packages/cast/oracles/README.md | 8 +- packages/cast/oracles/env/dc.fio.env | 4 +- packages/cast/oracles/env/dc.fro.env | 4 +- packages/cast/oracles/env/dc.fso.env | 4 +- packages/cast/oracles/env/dc.str.env | 2 +- .../cast/oracles/generatedClassFromGSDL.ts | 96 -------- .../oracles/integration/utils/envTemplates.ts | 2 +- packages/cast/oracles/nodemon.debug.json | 2 +- packages/cast/oracles/nodemon.json | 2 +- packages/cast/oracles/schema/fio.graphql | 208 +++++++++--------- packages/cast/oracles/schema/fro.graphql | 208 +++++++++--------- packages/cast/oracles/schema/fso.graphql | 208 +++++++++--------- packages/cast/oracles/schema/fxo.graphql | 208 +++++++++--------- packages/cast/oracles/schema/str.graphql | 48 ++-- .../cast/oracles/sonar-project.properties | 10 - .../src/modules/fro/fro.operation.service.ts | 24 +- .../oracles/src/modules/fro/fro.resolver.ts | 6 +- .../unit/fro/fro.operation.service.spec.ts | 18 +- 59 files changed, 561 insertions(+), 736 deletions(-) delete mode 100644 .env rename mkdocs/docs/img/{forge-ecosystem-components.png => cast-ecosystem-components.png} (100%) rename mkdocs/docs/tutorials/{bondEmission.md => bondIssuance.md} (98%) delete mode 100644 packages/cast/cast-interface-v1/sonar-project.properties delete mode 100644 packages/cast/chain-auth/sonar-project.properties delete mode 100644 packages/cast/models/src/models/operations/constants.ts delete mode 100644 packages/cast/models/src/models/operations/index.ts delete mode 100644 packages/cast/oracle-clients/sonar-project.properties delete mode 100644 packages/cast/oracles/generatedClassFromGSDL.ts delete mode 100644 packages/cast/oracles/sonar-project.properties diff --git a/.env b/.env deleted file mode 100644 index e470490..0000000 --- a/.env +++ /dev/null @@ -1,3 +0,0 @@ -GANACHE_PRIV="0x6aa2e67de571e04071d08df88d7252b8f3c2dae026187568fe0b8cb24d6b2255" -GANACHE_ADDRESS="0xaf9724349c52607fdd2049f2ab14bba5aa0be6a6" -TZ_KEY="forge,edpkv2Le5Zs15tUcA5XYEZtx6MdZi7rzPZQcR9GzPKevjwqPJPY257,tz1XLDSNujdGnfeWqNZAsndyFzAVqahHEovJ,unencrypted:edskRiPnv8PxD3LZcKgQ7UHLL5676DeZvRmny6Et4AhbSDtd7hcishWeDubQs6u8xLbHNAwBR5umHAJR5ssMFoVL51b8yQZA3x" \ No newline at end of file diff --git a/.gitignore b/.gitignore index a6693ea..b4ad229 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ node_modules/ -logs/ \ No newline at end of file +logs/ +.env diff --git a/.nxignore b/.nxignore index fb06d30..84ae126 100644 --- a/.nxignore +++ b/.nxignore @@ -5,9 +5,7 @@ # Personal Conf .vscode/ \.DS_Store -skaffold.yaml -auth0-cypress-demo/ # Created by .ignore support plugin (hsz.mobi) ### Node template # Logs diff --git a/cast.code-workspace b/cast.code-workspace index 5c82875..5d79f92 100644 --- a/cast.code-workspace +++ b/cast.code-workspace @@ -1,9 +1,6 @@ { "extensions": { "recommendations": [ - "googlecloudtools.cloudcode", - "msjsdiag.debugger-for-chrome", - "jingkaizhao.vscode-redux-devtools", "ms-azuretools.vscode-docker", "redhat.vscode-yaml", "mikestead.dotenv", @@ -43,7 +40,7 @@ "path": "packages/cast/cast-tz-v1" }, { - "name": "forge-platform", + "name": "cast-v1", "path": "." } ], @@ -75,10 +72,8 @@ "editor.tabSize": 2, "files.eol": "\n", "files.exclude": { - "packages/sgforge/www": true, "packages/cast/cast-eth-v1": true, "packages/cast/cast-tz-v1": true, - "charts": true, "packages": true }, "eslint.enable": true, @@ -179,7 +174,7 @@ "typescript.format.insertSpaceAfterSemicolonInForStatements": false, "typescript.format.insertSpaceBeforeAndAfterBinaryOperators": false, "typescript.reportStyleChecksAsWarnings": false, - "typescript.tsdk": "forge-platform/node_modules/typescript/lib", + "typescript.tsdk": "cast1/node_modules/typescript/lib", "workbench.editor.enablePreview": false, "solidity.enableLocalNodeCompiler": false, "python.formatting.autopep8Args": [ diff --git a/docker-compose.yml b/docker-compose.yml index 20d97ff..e2412b2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,8 +15,6 @@ services: - POSTGRES_DB=oracle ports: - '5434:5432' - volumes: - - './charts/forge-platform/init-data/defaults/default-str-postgres-init.sql:/docker-entrypoint-initdb.d/init.sql' fro: container_name: fro image: 'node:16.9.1-alpine3.14' @@ -106,7 +104,7 @@ services: - "20000:20000" volumes: - 'flextesa_data:/tmp' - command: hangzbox start --keep-root --add-bootstrap-account "${TZ_KEY}@2_000_000_000_000" --no-daemons-for=forge + command: hangzbox start --keep-root --add-bootstrap-account "${TZ_KEY}@2_000_000_000_000" --no-daemons-for=cast environment: - block_time=3 mkdocs: diff --git a/docs/fro/04_createEMTN_variables_TEZOS.json b/docs/fro/04_createEMTN_variables_TEZOS.json index 1fa13de..bac24f0 100644 --- a/docs/fro/04_createEMTN_variables_TEZOS.json +++ b/docs/fro/04_createEMTN_variables_TEZOS.json @@ -1,7 +1,7 @@ { "EMTN": { "status": "CREATED", - "issuerId": "O2RNE8IBXP4R0TD8PU41", + "issuerId": "40FB4DC1392C13C0C1D5", "isinCode": "202106301141", "cfiCode": "202106301141", "commonCode": "202106301141", @@ -18,11 +18,11 @@ "firstCouponDate": "2022-07-30T09:41:26.079Z", "isCallable": false, "callFrequency": "DAILY", - "registrarAgentAddress": "tz1es1Cci5T4NWhYHep7gnj3M3aF7Vq9CiLL", - "settlerAgentAddress": "tz1NF3vkkDAozuVrBKTWTmALULPkbVsa53r2", - "issuerAddress": "tz1fjUm3gdP9ugKKU9Uiv3StnVCC5CoaVqaF", - "registrarId": "969500FX8K40ZDW4F377", - "settlementAgentId": "PAREL_LEI", + "registrarAgentAddress": "tz1es1Cci5T4NWhYHep7jnj3M3aF7Vq9CiLL", + "settlerAgentAddress": "tz1NF3vkkDAozuVrBKTWTnALULPkbVsa53r2", + "issuerAddress": "tz1fjUm3gdP9ugKKU9Uiv3StnVCC5CoaVqeF", + "registrarId": "5F04801BA62A99392892", + "settlementAgentId": "6FE314DDB2F43A4AAA47", "EmtnType": "type1", "underlying": "UDL1", "isAutocall": true, diff --git a/docs/fro/05_initiateSubscription_variables_ETHEREUM.json b/docs/fro/05_initiateSubscription_variables_ETHEREUM.json index e6717ed..c5f77ac 100644 --- a/docs/fro/05_initiateSubscription_variables_ETHEREUM.json +++ b/docs/fro/05_initiateSubscription_variables_ETHEREUM.json @@ -1,7 +1,7 @@ { "initiateSubscriptionInput": { "settlementModel": "INDIRECT", - "intermediateAccountIBAN": "FR7630003011300300000000000", + "intermediateAccountIBAN": "FR7632000000000000000000000", "holdableTokenAddress": null, "settlementDate": "2022-04-04T08:44:32.785Z", "operationId": "974a2dcc-a241-447f-8ea2-82b00cf818bb", @@ -12,12 +12,12 @@ "tradeDate": "2022-03-04T09:44:32.785", "issuerAddresses": { "legalEntityId": "LEI_ISSUER_1", - "paymentAccountNumber": "FR7630003011300400000000000" + "paymentAccountNumber": "FR7633000000000000000000000" }, "investorAddresses": { "deliveryAccountNumber": "0xee39c0435ab3c4a205e9e117dcea0cc7610d7dc3", "legalEntityId": "LEI_INVESTOR_1", - "paymentAccountNumber": "FR7630003011300500000000000" + "paymentAccountNumber": "FR7631000000000000000000000" }, "deliveryQuantity": 1, "paymentAmount": 980000, diff --git a/docs/fro/05_initiateSubscription_variables_TEZOS.json b/docs/fro/05_initiateSubscription_variables_TEZOS.json index 214c91b..b98ff6b 100644 --- a/docs/fro/05_initiateSubscription_variables_TEZOS.json +++ b/docs/fro/05_initiateSubscription_variables_TEZOS.json @@ -1,7 +1,7 @@ { "initiateSubscriptionInput": { "settlementModel": "INDIRECT", - "intermediateAccountIBAN": "FR7630003011300300000000000", + "intermediateAccountIBAN": "FR7632000000000000000000000", "holdableTokenAddress": null, "settlementDate": "2022-04-04T08:44:32.785Z", "operationId": "974a2dcc-a241-447f-8ea2-82b00cf818bb", @@ -12,12 +12,12 @@ "tradeDate": "2022-03-04T09:44:32.785", "issuerAddresses": { "legalEntityId": "LEI_ISSUER_1", - "paymentAccountNumber": "FR7630003011300400000000000" + "paymentAccountNumber": "FR7633000000000000000000000" }, "investorAddresses": { "deliveryAccountNumber": "tz1gQZPnKpc97AXNohwkzBdHuw53KJrCkvRs", "legalEntityId": "LEI_INVESTOR_1", - "paymentAccountNumber": "FR7630003011300500000000000" + "paymentAccountNumber": "FR7631000000000000000000000" }, "deliveryQuantity": 1, "paymentAmount": 980000, diff --git a/docs/fso/commented/13_confirmPaymentTransferred_variables_with_comments.hjson b/docs/fso/commented/13_confirmPaymentTransferred_variables_with_comments.hjson index ccfc861..5610127 100644 --- a/docs/fso/commented/13_confirmPaymentTransferred_variables_with_comments.hjson +++ b/docs/fso/commented/13_confirmPaymentTransferred_variables_with_comments.hjson @@ -1,3 +1,3 @@ { - "settlementTransactionId": "a984f4ca-ee73-487b-9bca-04943819f3a0" // id of the corresponding settlement transaction + "settlementTransactionId": "2cc3e9bbfc2360j8" // id of the swift reference received } diff --git a/mkdocs/docs/img/forge-ecosystem-components.png b/mkdocs/docs/img/cast-ecosystem-components.png similarity index 100% rename from mkdocs/docs/img/forge-ecosystem-components.png rename to mkdocs/docs/img/cast-ecosystem-components.png diff --git a/mkdocs/docs/tutorials/bondEmission.md b/mkdocs/docs/tutorials/bondIssuance.md similarity index 98% rename from mkdocs/docs/tutorials/bondEmission.md rename to mkdocs/docs/tutorials/bondIssuance.md index 04b33c2..d79a840 100644 --- a/mkdocs/docs/tutorials/bondEmission.md +++ b/mkdocs/docs/tutorials/bondIssuance.md @@ -1,7 +1,7 @@ # Emitting a Bond using Financial Oracles This step by step guide will go through the bond emission process. -At the end of this tutorial you will have emitted and settled a new Forge Bond on +At the end of this tutorial you will have issued and settled a new Forge Bond on your local environnement. For this you need to interact with two components : the [Financial Registrar Oracle (FRO)](/modules/explorerFRO) and the [Financial Settlement Oracle (FSO)](/modules/explorerFSO). @@ -17,7 +17,7 @@ Any Financial Oracle (FO) can do this. For this tutorial, we will be using the < ### Registry Notification -Anytime a new contract is emitted by a factory, you will receive a notification here. +Anytime a new contract is issued by a factory, you will receive a notification here.
@@ -97,7 +97,7 @@ Keep that address, it represents your new Bond. ## Subscribing to the bond -Now that the bond is emitted, investors can subscribe. +Now that the bond is issued, investors can subscribe. For this example, we are using a preconfigured address as an investor. We now need to build a subscription object. @@ -157,7 +157,7 @@ Once the mutation is executed, you should receive a `ConfirmPaymentTransferred`
-**Congratulations** You have just emitted and subscribed to a Forge Bond ! +**Congratulations** You have just issued and subscribed to a Forge Bond !