From 5419e1efaef1f2c8e1702b8abac93b59d806eb53 Mon Sep 17 00:00:00 2001 From: Alex Stelea Date: Thu, 14 Sep 2023 11:21:00 +0200 Subject: [PATCH 01/13] chore: update connect button dependency --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1525f14a..86b74b2a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "Apache-2.0", "dependencies": { "@radixdlt/babylon-gateway-api-sdk": "1.0.0-rc.3.1.2", - "@radixdlt/connect-button": "0.13.4", + "@radixdlt/connect-button": "0.14.0", "@radixdlt/wallet-sdk": "0.10.1-alpha.1", "immer": "^10.0.2", "lodash.isequal": "^4.5.0", @@ -3289,9 +3289,9 @@ "integrity": "sha512-YpPRLbFavJh5IjaKX8lRKnb8xXnQ+n7Z5hDmhJDPPYUp7zwmxc/YWtSTiC0kTpNtFeDjIgE1f+Ed1j8cUNAlbg==" }, "node_modules/@radixdlt/connect-button": { - "version": "0.13.4", - "resolved": "https://registry.npmjs.org/@radixdlt/connect-button/-/connect-button-0.13.4.tgz", - "integrity": "sha512-5jeiiFJLBnJzC3nimWY7sKzQgRgtHAb0rMRjxtBxdBusr/HjTIoedLmOHBv5Yc+kpJSKAdtBp/PovaVOcM06qQ==", + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@radixdlt/connect-button/-/connect-button-0.14.0.tgz", + "integrity": "sha512-HqAkL0z+3Bq4nQUZr+107B/c5hz/aM01FFYD1SeSrpGwhz0vagNR7AnKVxC/M9wHxmBjGzEef7B9l63Xf69ugg==", "dependencies": { "lit": "^2.7.5" }, diff --git a/package.json b/package.json index 61217130..12f31b4a 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ }, "dependencies": { "@radixdlt/babylon-gateway-api-sdk": "1.0.0-rc.3.1.2", - "@radixdlt/connect-button": "0.13.4", + "@radixdlt/connect-button": "0.14.0", "@radixdlt/wallet-sdk": "0.10.1-alpha.1", "immer": "^10.0.2", "lodash.isequal": "^4.5.0", From 078a737b223b19c13f90f55f5aeec854684ae98b Mon Sep 17 00:00:00 2001 From: Dawid Sowa Date: Wed, 20 Sep 2023 22:59:39 +0200 Subject: [PATCH 02/13] feat: add dapps dropdown --- examples/components/Layout.tsx | 1 + examples/layouts/Header.tsx | 15 ++++++++++++++- package-lock.json | 13 +++++++++++++ package.json | 1 + 4 files changed, 29 insertions(+), 1 deletion(-) diff --git a/examples/components/Layout.tsx b/examples/components/Layout.tsx index 076aac56..1585573b 100644 --- a/examples/components/Layout.tsx +++ b/examples/components/Layout.tsx @@ -51,6 +51,7 @@ function Header(props: BoxProps) { sx={[ { p: 2, + pr: 3, gap: 2, bgcolor: 'background.surface', display: 'flex', diff --git a/examples/layouts/Header.tsx b/examples/layouts/Header.tsx index 8c7e0844..2c10d56c 100644 --- a/examples/layouts/Header.tsx +++ b/examples/layouts/Header.tsx @@ -1,6 +1,7 @@ // @ts-ignore import radixLogo from '../assets/radix-icon_128x128.png' import * as React from 'react' +import '@radixdlt/dapps-dropdown' import Box from '@mui/joy/Box' import Typography from '@mui/joy/Typography' import IconButton from '@mui/joy/IconButton' @@ -18,6 +19,10 @@ declare global { React.HTMLAttributes, HTMLElement > + 'radix-dapps-dropdown': React.DetailedHTMLProps< + React.HTMLAttributes, + HTMLElement + > } } } @@ -57,7 +62,14 @@ export const Header = ({ - + + ) diff --git a/package-lock.json b/package-lock.json index 86b74b2a..0c4dd8ec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,6 +30,7 @@ "@mui/icons-material": "^5.11.16", "@mui/joy": "^5.0.0-alpha.76", "@mui/material": "^5.12.1", + "@radixdlt/dapps-dropdown": "^0.2.0", "@radixdlt/radix-engine-toolkit": "0.4.0", "@radixdlt/rola": "^0.3.1-rcnet-v3.1.1", "@types/elliptic": "^6.4.14", @@ -3299,6 +3300,18 @@ "node": ">=16.0.0" } }, + "node_modules/@radixdlt/dapps-dropdown": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@radixdlt/dapps-dropdown/-/dapps-dropdown-0.2.0.tgz", + "integrity": "sha512-6o+ftsaX2H8tppcBSoVHEMGHfelYenqVVMpEwzH5OOpO11O7UB2TojbSToztDXua6GJXJ0xBFIFIzfg5pzzRDw==", + "dev": true, + "dependencies": { + "lit": "^2.7.6" + }, + "engines": { + "node": ">=16.0.0" + } + }, "node_modules/@radixdlt/radix-engine-toolkit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/@radixdlt/radix-engine-toolkit/-/radix-engine-toolkit-0.4.0.tgz", diff --git a/package.json b/package.json index 12f31b4a..84e235a7 100644 --- a/package.json +++ b/package.json @@ -70,6 +70,7 @@ "@mui/joy": "^5.0.0-alpha.76", "@mui/material": "^5.12.1", "@radixdlt/radix-engine-toolkit": "0.4.0", + "@radixdlt/dapps-dropdown": "^0.2.0", "@radixdlt/rola": "^0.3.1-rcnet-v3.1.1", "@types/elliptic": "^6.4.14", "@types/jest": "^29.4.0", From c6ae0825692e6aa541990e676f2147ffbcbb28e4 Mon Sep 17 00:00:00 2001 From: Dawid Sowa Date: Thu, 21 Sep 2023 16:14:15 +0200 Subject: [PATCH 03/13] fix(sandbox): update create nft & integration TXs --- examples/create-token/CreateNftCard.tsx | 1 - .../GumballMachine/GumballMachineExamples.tsx | 6 +++--- examples/manifests/examples.ts | 6 +++--- examples/manifests/tokens.ts | 16 ++++------------ 4 files changed, 10 insertions(+), 19 deletions(-) diff --git a/examples/create-token/CreateNftCard.tsx b/examples/create-token/CreateNftCard.tsx index a516d301..c28086d7 100644 --- a/examples/create-token/CreateNftCard.tsx +++ b/examples/create-token/CreateNftCard.tsx @@ -7,7 +7,6 @@ import FormLabel from '@mui/joy/FormLabel' import Button from '@mui/joy/Button' import { createToken } from '../manifests/tokens' import { useRdt } from '../rdt/hooks/useRdt' -import { accounts } from '../../src/data-request/builders/accounts' import { Alert, Stack } from '@mui/joy' import { useLogger } from '../components/Logger' import { Card } from '../components/Card' diff --git a/examples/integration-tests/GumballMachine/GumballMachineExamples.tsx b/examples/integration-tests/GumballMachine/GumballMachineExamples.tsx index 44ec7727..e96c0bfe 100644 --- a/examples/integration-tests/GumballMachine/GumballMachineExamples.tsx +++ b/examples/integration-tests/GumballMachine/GumballMachineExamples.tsx @@ -77,10 +77,10 @@ a) Deposit entire worktop to Alpha`, ['accountAlpha', 'accountBravo', 'componentAlpha', 'componentBravo'], `Instantiate another gumball machine prior to this scenario, again assuming price of 1 -1) Withdraw 2 XRD from Alpha -2) Create bucket of 2 XRD +1) Withdraw 8 XRD from Alpha +2) Create bucket of 8 XRD 3) Call buy_gumball on machine Alpha with bucket -4) Create bucket of all XRD +4) Create bucket of 7 XRD 5) Call buy_gumball on machine Bravo with bucket 6) Deposit entire worktop to Bravo`, ], diff --git a/examples/manifests/examples.ts b/examples/manifests/examples.ts index 69d5c69a..8c99beb0 100644 --- a/examples/manifests/examples.ts +++ b/examples/manifests/examples.ts @@ -69,10 +69,10 @@ export const getExample6 = ( }: GumballMachineExampleConfig ) => ` -CALL_METHOD Address("${accountAlpha}") "withdraw" Address("${xrdAddress}") Decimal("2"); -TAKE_FROM_WORKTOP Address("${xrdAddress}") Decimal("2") Bucket("xrd"); +CALL_METHOD Address("${accountAlpha}") "withdraw" Address("${xrdAddress}") Decimal("8"); +TAKE_FROM_WORKTOP Address("${xrdAddress}") Decimal("8") Bucket("xrd"); CALL_METHOD Address("${componentAlpha?.address}") "buy_gumball" Bucket("xrd"); -TAKE_FROM_WORKTOP Address("${xrdAddress}") Decimal("1") Bucket("restxrd"); +TAKE_FROM_WORKTOP Address("${xrdAddress}") Decimal("7") Bucket("restxrd"); CALL_METHOD Address("${componentBravo?.address}") "buy_gumball" Bucket("restxrd"); CALL_METHOD Address("${accountBravo}") "try_deposit_batch_or_abort" Expression("ENTIRE_WORKTOP") Enum<0u8>(); ` diff --git a/examples/manifests/tokens.ts b/examples/manifests/tokens.ts index 509a9043..e835e3e1 100644 --- a/examples/manifests/tokens.ts +++ b/examples/manifests/tokens.ts @@ -82,7 +82,7 @@ CALL_METHOD Enum<0u8>() Enum<1u8>() true - Enum( + Enum<0u8>( Enum<0u8>( Tuple( Array( @@ -94,15 +94,14 @@ CALL_METHOD Enum<0u8>( 12u8 ), - Enum<1u8>( - 1u64 + Enum<0u8>( + 198u8 ), Enum<0u8>( 10u8 ) ) - ), - Enum<12u8>() + ) ), Array( Tuple( @@ -119,16 +118,9 @@ CALL_METHOD ) ) ) - ), - Tuple( - Enum<1u8>( - "UncheckedUrl" - ), - Enum<0u8>() ) ), Array( - Enum<0u8>(), Enum<0u8>() ) ) From f36f771f8b985605a7362a1452e4788794d1383b Mon Sep 17 00:00:00 2001 From: Dawid Sowa Date: Thu, 21 Sep 2023 17:47:28 +0200 Subject: [PATCH 04/13] fix(sandbox): update dapp def address --- examples/rdt/rdt.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/rdt/rdt.ts b/examples/rdt/rdt.ts index 574b71b7..184fb2ba 100644 --- a/examples/rdt/rdt.ts +++ b/examples/rdt/rdt.ts @@ -40,9 +40,9 @@ const getDAppDefinitionFromLocalStorage = (): Record => { [RadixNetwork.Enkinet]: 'account_tdx_21_168ydk240yx69yl7zdz2mzkdjc3r5p6n4gwypqsype2d6d942z0tyvx', [RadixNetwork.RCnetV3]: - 'account_tdx_e_168ydk240yx69yl7zdz2mzkdjc3r5p6n4gwypqsype2d6d942m5z2ns', + 'account_tdx_e_12965dqmkmgs96s5cx7r52dg0shjvl7urwqy8eqeq2heym89ralzqdp', [RadixNetwork.Zabanet]: - 'account_tdx_e_168ydk240yx69yl7zdz2mzkdjc3r5p6n4gwypqsype2d6d942m5z2ns', + 'account_tdx_e_12965dqmkmgs96s5cx7r52dg0shjvl7urwqy8eqeq2heym89ralzqdp', } } From 2fb8986c220842ed70020de2128499710c8214b6 Mon Sep 17 00:00:00 2001 From: Duje Begonja RDX <108268552+duje-begonja-rdx@users.noreply.github.com> Date: Fri, 22 Sep 2023 10:07:03 +0200 Subject: [PATCH 05/13] [DO-1804] add mainnet env (#128) --- .github/workflows/build.yml | 47 +++++++++++++++++++ .../environments/mainnet/values.yaml.gotmpl | 35 ++++++++++++++ deploy/helm/helmfile.yaml | 8 ++++ .../templates/basic-auth-secret.yaml | 13 +++++ 4 files changed, 103 insertions(+) create mode 100644 deploy/helm/environments/mainnet/values.yaml.gotmpl create mode 100644 deploy/helm/radix-dapp-toolkit/templates/basic-auth-secret.yaml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 641fa4c8..656a20ae 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -351,3 +351,50 @@ jobs: INGRESS_DOMAIN: ${{ secrets.INGRESS_DOMAIN }} HELM_GH_USER: ${{ secrets.HELM_GH_USER }} HELM_GH_PASS: ${{ secrets.HELM_GH_PASS }} + + deploy-mainnet: + if: github.event_name == 'release' && !github.event.release.prerelease + runs-on: ubuntu-latest + needs: + - push-docker-image + permissions: + id-token: write + contents: read + pull-requests: read + steps: + - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b + - uses: unfor19/install-aws-cli-action@457b7980b125044247e455d87b9a26fc2299b787 + with: + version: 2 + - name: Setup helmfile and helm + uses: mamezou-tech/setup-helmfile@55ae2a66c5af4883148b7a50cc6ddc9b61042184 + with: + helm-diff-plugin-version: 'v3.1.3' + helmfile-version: 'v0.144.0' + helm-version: 'v3.11.0' + install-kubectl: no + - name: Install kubectl + uses: azure/setup-kubectl@901a10e89ea615cf61f57ac05cecdf23e7de06d8 #v3.2 + with: + version: 'v1.25.6' + - name: Configure AWS credentials for deployment + uses: aws-actions/configure-aws-credentials@bab55d3830fe69833c9fecaa51fe2c829a7508f3 + with: + role-to-assume: ${{ secrets.DEPLOY_MAINNET_IAM_ROLE }} + aws-region: eu-west-2 + - name: Deploy application + working-directory: deploy/helm + run: | + aws eks update-kubeconfig --name ${{ secrets.MAINNET_CLUSTER_NAME }} \ + --alias ${{ secrets.MAINNET_CLUSTER_NAME }} \ + --region eu-west-2 + + helmfile --environment mainnet --namespace radix-dapp-toolkit-mainnet \ + --state-values-set "ci.tag=${{ env.CI_TAG }}" \ + --state-values-set "ci.ingressDomain=${{ env.INGRESS_DOMAIN }}" \ + apply + env: + CI_TAG: ${{ fromJSON(needs.push-docker-image.outputs.json).labels['org.opencontainers.image.version'] }} + INGRESS_DOMAIN: ${{ secrets.MAINNET_INGRESS_DOMAIN }} + HELM_GH_USER: ${{ secrets.HELM_GH_USER }} + HELM_GH_PASS: ${{ secrets.HELM_GH_PASS }} diff --git a/deploy/helm/environments/mainnet/values.yaml.gotmpl b/deploy/helm/environments/mainnet/values.yaml.gotmpl new file mode 100644 index 00000000..b7d06778 --- /dev/null +++ b/deploy/helm/environments/mainnet/values.yaml.gotmpl @@ -0,0 +1,35 @@ +autoscaling: + enabled: true + minReplicas: 3 + maxReplicas: 15 + targetCPUUtilizationPercentage: 70 + targetMemoryUtilizationPercentage: 70 +resources: + limits: + memory: 256Mi + requests: + cpu: 150m + memory: 256Mi + +ingress: + enabled: true + hosts: + - host: {{ .StateValues.ci.ingressDomain }} + paths: + - path: / + pathType: Prefix + basic_auth: true + annotations: + nginx.ingress.kubernetes.io/auth-type: basic + nginx.ingress.kubernetes.io/auth-secret: radix-dapp-toolkit-basic-auth + nginx.ingress.kubernetes.io/auth-realm: 'Auth Required - Mainnet' + +alertmanager: + env: "mainnet" + nameOverride: "radix-dapp-toolkit-amcfg" + slackConfig: + channel: "feed--alerts-dapps-mainnet" + secrets: + region: eu-west-2 + name: "rtlj-prod/eks/dapps/mainnet/alertmanager-integration-keys" + enable_pagerduty_notifications: true \ No newline at end of file diff --git a/deploy/helm/helmfile.yaml b/deploy/helm/helmfile.yaml index cf7e2d9e..f0ae7536 100644 --- a/deploy/helm/helmfile.yaml +++ b/deploy/helm/helmfile.yaml @@ -13,6 +13,7 @@ repositories: environments: dev: {} pr: {} + mainnet: {} releases: - name: radix-dapp-toolkit chart: ./radix-dapp-toolkit @@ -26,3 +27,10 @@ releases: values: - environments/common/values.yaml.gotmpl - environments/{{ .Environment.Name }}/values.yaml.gotmpl + + - name: alertmanager + chart: rdx-works/alertmanager-configs + version: 1.1.0 + installed: {{ eq .Environment.Name "mainnet" }} + values: + - environments/{{ .Environment.Name }}/values.yaml.gotmpl diff --git a/deploy/helm/radix-dapp-toolkit/templates/basic-auth-secret.yaml b/deploy/helm/radix-dapp-toolkit/templates/basic-auth-secret.yaml new file mode 100644 index 00000000..19fc684f --- /dev/null +++ b/deploy/helm/radix-dapp-toolkit/templates/basic-auth-secret.yaml @@ -0,0 +1,13 @@ +{{- if .Values.ingress.basic_auth }} +apiVersion: kubernetes-client.io/v1 +kind: ExternalSecret +metadata: + name: radix-dapp-toolkit-basic-auth +spec: + backendType: secretsManager + region: eu-west-2 + data: + - key: rtlj-prod/eks/dapps/mainnet/temp-basic-auth + name: auth + property: auth +{{- end }} From 6837efec50036ae34dfd0f559bdeeb4d5f645337 Mon Sep 17 00:00:00 2001 From: Duje Begonja RDX <108268552+duje-begonja-rdx@users.noreply.github.com> Date: Fri, 22 Sep 2023 14:17:28 +0200 Subject: [PATCH 06/13] [DO-1835] add stokenet env (#134) --- .github/workflows/build.yml | 58 ++++++++++++++++++- .../environments/stokenet/values.yaml.gotmpl | 30 ++++++++++ deploy/helm/helmfile.yaml | 3 +- 3 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 deploy/helm/environments/stokenet/values.yaml.gotmpl diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 656a20ae..4c67a0e1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,6 +2,14 @@ name: Build on: workflow_dispatch: + inputs: + ENVIRONMENT_NAME: + description: 'Environment Name' + required: true + default: Stokenet + type: choice + options: + - Stokenet push: branches: @@ -246,7 +254,7 @@ jobs: HELM_GH_PASS: ${{ secrets.HELM_GH_PASS }} deploy-dev: - if: github.ref == 'refs/heads/develop' + if: github.ref == 'refs/heads/develop' && github.event_name == 'push' runs-on: ubuntu-latest needs: - push-docker-image @@ -352,6 +360,54 @@ jobs: HELM_GH_USER: ${{ secrets.HELM_GH_USER }} HELM_GH_PASS: ${{ secrets.HELM_GH_PASS }} + deploy-stokenet: + if: ( github.event.inputs.ENVIRONMENT_NAME == 'Stokenet' && github.event_name == 'workflow_dispatch' ) + runs-on: ubuntu-latest + environment: stokenet + needs: + - push-docker-image + permissions: + id-token: write + contents: read + pull-requests: read + steps: + - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b + - uses: unfor19/install-aws-cli-action@457b7980b125044247e455d87b9a26fc2299b787 + with: + version: 2 + - name: Setup helmfile and helm + uses: mamezou-tech/setup-helmfile@55ae2a66c5af4883148b7a50cc6ddc9b61042184 + with: + helm-diff-plugin-version: 'v3.1.3' + helmfile-version: 'v0.144.0' + helm-version: 'v3.11.0' + install-kubectl: no + - name: Install kubectl + uses: azure/setup-kubectl@901a10e89ea615cf61f57ac05cecdf23e7de06d8 #v3.2 + with: + version: 'v1.25.6' + - name: Configure AWS credentials for deployment + uses: aws-actions/configure-aws-credentials@bab55d3830fe69833c9fecaa51fe2c829a7508f3 + with: + role-to-assume: ${{ secrets.DEPLOY_STOKENET_IAM_ROLE }} + aws-region: eu-west-2 + - name: Deploy application + working-directory: deploy/helm + run: | + aws eks update-kubeconfig --name ${{ secrets.STOKENET_CLUSTER_NAME }} \ + --alias ${{ secrets.STOKENET_CLUSTER_NAME }} \ + --region eu-west-2 + + helmfile --environment stokenet --namespace radix-dapp-toolkit-stokenet \ + --state-values-set "ci.tag=${{ env.CI_TAG }}" \ + --state-values-set "ci.ingressDomain=${{ env.INGRESS_DOMAIN }}" \ + apply + env: + CI_TAG: ${{ fromJSON(needs.push-docker-image.outputs.json).labels['org.opencontainers.image.version'] }} + INGRESS_DOMAIN: ${{ secrets.STOKENET_INGRESS_DOMAIN }} + HELM_GH_USER: ${{ secrets.HELM_GH_USER }} + HELM_GH_PASS: ${{ secrets.HELM_GH_PASS }} + deploy-mainnet: if: github.event_name == 'release' && !github.event.release.prerelease runs-on: ubuntu-latest diff --git a/deploy/helm/environments/stokenet/values.yaml.gotmpl b/deploy/helm/environments/stokenet/values.yaml.gotmpl new file mode 100644 index 00000000..f6c61b89 --- /dev/null +++ b/deploy/helm/environments/stokenet/values.yaml.gotmpl @@ -0,0 +1,30 @@ +autoscaling: + enabled: true + minReplicas: 2 + maxReplicas: 5 + targetCPUUtilizationPercentage: 70 + targetMemoryUtilizationPercentage: 70 +resources: + limits: + memory: 256Mi + requests: + cpu: 150m + memory: 256Mi + +ingress: + enabled: true + hosts: + - host: {{ .StateValues.ci.ingressDomain }} + paths: + - path: / + pathType: Prefix + +alertmanager: + env: "stokenet" + nameOverride: "radix-dapp-toolkit-amcfg" + slackConfig: + channel: "feed--alerts-dapps-dev" + secrets: + region: eu-west-2 + name: "rtlj-prod/eks/dapps/dev/alertmanager-integration-keys" + enable_pagerduty_notifications: true \ No newline at end of file diff --git a/deploy/helm/helmfile.yaml b/deploy/helm/helmfile.yaml index f0ae7536..2d310d8c 100644 --- a/deploy/helm/helmfile.yaml +++ b/deploy/helm/helmfile.yaml @@ -13,6 +13,7 @@ repositories: environments: dev: {} pr: {} + stokenet: {} mainnet: {} releases: - name: radix-dapp-toolkit @@ -31,6 +32,6 @@ releases: - name: alertmanager chart: rdx-works/alertmanager-configs version: 1.1.0 - installed: {{ eq .Environment.Name "mainnet" }} + installed: {{ or (eq .Environment.Name "mainnet") (eq .Environment.Name "stokenet") }} values: - environments/{{ .Environment.Name }}/values.yaml.gotmpl From 8848135ebdffdcd456f61d09d9f865ed775eeb04 Mon Sep 17 00:00:00 2001 From: Dawid Sowa Date: Fri, 22 Sep 2023 16:13:38 +0200 Subject: [PATCH 07/13] feat: move dapps dropdown to the left --- examples/layouts/Header.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/layouts/Header.tsx b/examples/layouts/Header.tsx index 2c10d56c..5aef0e06 100644 --- a/examples/layouts/Header.tsx +++ b/examples/layouts/Header.tsx @@ -70,6 +70,7 @@ export const Header = ({ gap: 1.5, }} > + - ) From 977fc34f5d23e1dbd67103cb08409ea4adfaf3aa Mon Sep 17 00:00:00 2001 From: Alex Stelea Date: Sun, 24 Sep 2023 12:50:51 +0200 Subject: [PATCH 08/13] chore: update gateway sdk --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0c4dd8ec..fbe815f7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "0.0.0", "license": "Apache-2.0", "dependencies": { - "@radixdlt/babylon-gateway-api-sdk": "1.0.0-rc.3.1.2", + "@radixdlt/babylon-gateway-api-sdk": "1.0.0", "@radixdlt/connect-button": "0.14.0", "@radixdlt/wallet-sdk": "0.10.1-alpha.1", "immer": "^10.0.2", @@ -3285,9 +3285,9 @@ } }, "node_modules/@radixdlt/babylon-gateway-api-sdk": { - "version": "1.0.0-rc.3.1.2", - "resolved": "https://registry.npmjs.org/@radixdlt/babylon-gateway-api-sdk/-/babylon-gateway-api-sdk-1.0.0-rc.3.1.2.tgz", - "integrity": "sha512-YpPRLbFavJh5IjaKX8lRKnb8xXnQ+n7Z5hDmhJDPPYUp7zwmxc/YWtSTiC0kTpNtFeDjIgE1f+Ed1j8cUNAlbg==" + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@radixdlt/babylon-gateway-api-sdk/-/babylon-gateway-api-sdk-1.0.0.tgz", + "integrity": "sha512-P9j4OFvletgaWrrtgPF41Zj0yQ1jnx+jVPoAO/Rf5UkBP6ILUiL1qSAufPgTr9dSvnHk8WDyygiijWq2j/xAmA==" }, "node_modules/@radixdlt/connect-button": { "version": "0.14.0", diff --git a/package.json b/package.json index 84e235a7..e94c2b2d 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "test:watch": "jest --watch" }, "dependencies": { - "@radixdlt/babylon-gateway-api-sdk": "1.0.0-rc.3.1.2", + "@radixdlt/babylon-gateway-api-sdk": "1.0.0", "@radixdlt/connect-button": "0.14.0", "@radixdlt/wallet-sdk": "0.10.1-alpha.1", "immer": "^10.0.2", From 3e69a84d2f304e6b46c6b9b81684bd0c0ce67764 Mon Sep 17 00:00:00 2001 From: Dawid Sowa Date: Fri, 22 Sep 2023 17:31:44 +0200 Subject: [PATCH 09/13] docs: update license --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index edd33e65..25da0002 100644 --- a/README.md +++ b/README.md @@ -38,6 +38,7 @@ - [Setting up a dApp Definition on the Radix Dashboard](#setting-up-a-dapp-definition-on-the-radix-dashboard) - [Data storage](#data-storage) - [Examples](#examples) +- [License](#license) # What is Radix dApp Toolkit? @@ -582,3 +583,7 @@ RDT handles writing and reading data to the browser’s local storage so that it # Examples The `examples` directory contains a react dApp that consumes RDT. Its main purpose is to be used by us internally for debugging but can also serve as a source of inspiration. + +# License + +The Radix Dapp Toolkit code is released under [Apache 2.0 license](LICENSE). Binaries are licensed under the [Radix Software EULA](http://www.radixdlt.com/terms/genericEULA) \ No newline at end of file From 16e31b0f6dae1ead5bcb10592bf58a92a30625b0 Mon Sep 17 00:00:00 2001 From: Alex Stelea Date: Sun, 24 Sep 2023 14:27:45 +0200 Subject: [PATCH 10/13] chore: update gateway sdk --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index fbe815f7..720fde6f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "0.0.0", "license": "Apache-2.0", "dependencies": { - "@radixdlt/babylon-gateway-api-sdk": "1.0.0", + "@radixdlt/babylon-gateway-api-sdk": "1.0.1", "@radixdlt/connect-button": "0.14.0", "@radixdlt/wallet-sdk": "0.10.1-alpha.1", "immer": "^10.0.2", @@ -3285,9 +3285,9 @@ } }, "node_modules/@radixdlt/babylon-gateway-api-sdk": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@radixdlt/babylon-gateway-api-sdk/-/babylon-gateway-api-sdk-1.0.0.tgz", - "integrity": "sha512-P9j4OFvletgaWrrtgPF41Zj0yQ1jnx+jVPoAO/Rf5UkBP6ILUiL1qSAufPgTr9dSvnHk8WDyygiijWq2j/xAmA==" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@radixdlt/babylon-gateway-api-sdk/-/babylon-gateway-api-sdk-1.0.1.tgz", + "integrity": "sha512-WLfw+NuoFC04SgGKpGvkrFp67BdzCbKwklFmNjTqX9l/A0dUN820Xggf1BZ8jRUDUJI20V+fAsTTvT7ltYMJIQ==" }, "node_modules/@radixdlt/connect-button": { "version": "0.14.0", diff --git a/package.json b/package.json index e94c2b2d..b02476e2 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "test:watch": "jest --watch" }, "dependencies": { - "@radixdlt/babylon-gateway-api-sdk": "1.0.0", + "@radixdlt/babylon-gateway-api-sdk": "1.0.1", "@radixdlt/connect-button": "0.14.0", "@radixdlt/wallet-sdk": "0.10.1-alpha.1", "immer": "^10.0.2", From 8e3d986001bc5586b9750243db821b8b8a9703f7 Mon Sep 17 00:00:00 2001 From: Alex Stelea Date: Sun, 24 Sep 2023 14:40:23 +0200 Subject: [PATCH 11/13] chore: update release tag --- release.config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release.config.js b/release.config.js index ab88befa..744ed0b8 100644 --- a/release.config.js +++ b/release.config.js @@ -4,8 +4,8 @@ module.exports = { 'next', { name: 'develop', - channel: 'dev-rc3.1', - prerelease: 'dev-rc3.1', + channel: 'dev-stokenet', + prerelease: 'dev-stokenet', }, { name: 'release/([a-z0-9-.]+)', From 6a957fb6a2c9c9b862cd8a3deb20dd2329723a84 Mon Sep 17 00:00:00 2001 From: Alex Stelea Date: Sun, 24 Sep 2023 15:03:39 +0200 Subject: [PATCH 12/13] major: release 1.0.0 --- commitlint.config.js | 24 +++++++++++++++++++++++- release.config.js | 8 ++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/commitlint.config.js b/commitlint.config.js index 4fedde6d..052f89f3 100644 --- a/commitlint.config.js +++ b/commitlint.config.js @@ -1 +1,23 @@ -module.exports = { extends: ['@commitlint/config-conventional'] } +module.exports = { + extends: ['@commitlint/config-conventional'], + rules: { + 'type-enum': () => [ + 2, + 'always', + [ + 'build', + 'chore', + 'ci', + 'docs', + 'feat', + 'fix', + 'perf', + 'refactor', + 'revert', + 'style', + 'test', + 'major', + ], + ], + }, +} diff --git a/release.config.js b/release.config.js index 744ed0b8..266c584d 100644 --- a/release.config.js +++ b/release.config.js @@ -23,6 +23,10 @@ module.exports = { type: 'refactor', release: 'patch', }, + { + type: 'major', + release: 'major', + }, { type: 'docs', scope: 'README', @@ -84,6 +88,10 @@ module.exports = { section: ':bug: Fixes', hidden: false, }, + { + type: 'major', + release: 'major', + }, { type: 'docs', section: ':memo: Documentation', From bb5b7d8d8ea854f2c21bce88d90135299329ec23 Mon Sep 17 00:00:00 2001 From: Alex Stelea Date: Sun, 24 Sep 2023 15:50:48 +0200 Subject: [PATCH 13/13] chore: update dependencies --- package-lock.json | 16 ++++++++-------- package.json | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 720fde6f..7f2475bb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,8 +10,8 @@ "license": "Apache-2.0", "dependencies": { "@radixdlt/babylon-gateway-api-sdk": "1.0.1", - "@radixdlt/connect-button": "0.14.0", - "@radixdlt/wallet-sdk": "0.10.1-alpha.1", + "@radixdlt/connect-button": "1.0.0", + "@radixdlt/wallet-sdk": "1.0.1", "immer": "^10.0.2", "lodash.isequal": "^4.5.0", "neverthrow": "^6.0.0", @@ -3290,9 +3290,9 @@ "integrity": "sha512-WLfw+NuoFC04SgGKpGvkrFp67BdzCbKwklFmNjTqX9l/A0dUN820Xggf1BZ8jRUDUJI20V+fAsTTvT7ltYMJIQ==" }, "node_modules/@radixdlt/connect-button": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/@radixdlt/connect-button/-/connect-button-0.14.0.tgz", - "integrity": "sha512-HqAkL0z+3Bq4nQUZr+107B/c5hz/aM01FFYD1SeSrpGwhz0vagNR7AnKVxC/M9wHxmBjGzEef7B9l63Xf69ugg==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@radixdlt/connect-button/-/connect-button-1.0.0.tgz", + "integrity": "sha512-MLgKibN8dyMW2GUu89EWyJrwyMUragXKNzpzluc4PnXWBd3foNnj0RHFU1o3/PkJkfgUPxdUcIZ54JTwtQAtyQ==", "dependencies": { "lit": "^2.7.5" }, @@ -3345,9 +3345,9 @@ } }, "node_modules/@radixdlt/wallet-sdk": { - "version": "0.10.1-alpha.1", - "resolved": "https://registry.npmjs.org/@radixdlt/wallet-sdk/-/wallet-sdk-0.10.1-alpha.1.tgz", - "integrity": "sha512-kCmCLJ3Yi2VZhN7/B9nhnTi6JNuiy8+otQy3kh1JNb0pd9CV6o6YS/Vj85mVoGtePVog4UHmu6RKFbPR9TVrfg==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@radixdlt/wallet-sdk/-/wallet-sdk-1.0.1.tgz", + "integrity": "sha512-g6TY1kUihJrECKBKs+dbTFrfzUU3bj1H2ySeaiHRNs/40eRH2Vw6heyb8DRHSkfhTzhPxXBzQxQdk908RgktUA==", "dependencies": { "neverthrow": "^6.0.0", "rxjs": "^7.8.1", diff --git a/package.json b/package.json index b02476e2..5a29993b 100644 --- a/package.json +++ b/package.json @@ -49,8 +49,8 @@ }, "dependencies": { "@radixdlt/babylon-gateway-api-sdk": "1.0.1", - "@radixdlt/connect-button": "0.14.0", - "@radixdlt/wallet-sdk": "0.10.1-alpha.1", + "@radixdlt/connect-button": "1.0.0", + "@radixdlt/wallet-sdk": "1.0.1", "immer": "^10.0.2", "lodash.isequal": "^4.5.0", "neverthrow": "^6.0.0",