Merge pull request #7 from radixdlt/release/rcnet-v3.1

Release/rcnet v3.1
radixdlt · Sep 7, 2023 · e03decf · e03decf
2 parents 65d928e + da7a04a
commit e03decf
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 150 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -3,7 +3,7 @@ on:
   push:
     branches:
       - develop
-      - release/rcnet-v3
+      - release/*
   workflow_dispatch:
 
 jobs:

diff --git a/release.config.js b/release.config.js
@@ -7,6 +7,11 @@ module.exports = {
       channel: 'rcnet-v3',
       prerelease: 'rcnet-v3',
     },
+    {
+      name: 'release/rcnet-v3.1',
+      channel: 'rcnet-v3.1',
+      prerelease: 'rcnet-v3.1',
+    },
   ],
   plugins: [
     [

diff --git a/typescript/package-lock.json b/typescript/package-lock.json
diff --git a/typescript/package.json b/typescript/package.json
@@ -84,8 +84,8 @@
     "vite-tsconfig-paths": "^4.2.0"
   },
   "dependencies": {
-    "@radixdlt/radix-dapp-toolkit": "0.6.1",
-    "@radixdlt/radix-engine-toolkit": "0.3.0",
+    "@radixdlt/babylon-gateway-api-sdk": "^1.0.0-rc.3.1.1",
+    "@radixdlt/radix-engine-toolkit": "0.4.0",
     "elliptic": "^6.5.4",
     "neverthrow": "^6.0.0"
   },

diff --git a/typescript/src/helpers/derive-address-from-public-key.ts b/typescript/src/helpers/derive-address-from-public-key.ts
@@ -1,4 +1,4 @@
-import type { SignedChallenge } from '@radixdlt/radix-dapp-toolkit'
+import type { SignedChallenge } from '../types'
 import { PublicKey, RadixEngineToolkit } from '@radixdlt/radix-engine-toolkit'
 import { ResultAsync, errAsync } from 'neverthrow'
 import { typedError } from './typed-error'

diff --git a/typescript/src/helpers/verify-proof.ts b/typescript/src/helpers/verify-proof.ts
@@ -2,7 +2,7 @@ import type { Result } from 'neverthrow'
 import { err, ok } from 'neverthrow'
 import { curve25519 } from '../crypto/curve25519'
 import { secp256k1 } from '../crypto/secp256k1'
-import type { SignedChallenge } from '@radixdlt/radix-dapp-toolkit'
+import type { SignedChallenge } from '../types'
 
 const supportedCurves = new Set(['curve25519', 'secp256k1'])
 

diff --git a/typescript/src/rola.spec.ts b/typescript/src/rola.spec.ts
@@ -1,6 +1,6 @@
 import { NetworkId } from '@radixdlt/radix-engine-toolkit'
 import { Rola } from './rola'
-import type { SignedChallenge } from '@radixdlt/radix-dapp-toolkit'
+import type { SignedChallenge } from './types'
 
 describe('Rola', () => {
   const { verifySignedChallenge } = Rola({

diff --git a/typescript/src/rola.ts b/typescript/src/rola.ts
@@ -7,15 +7,12 @@ import { verifyProofFactory } from './helpers/verify-proof'
 import { deriveVirtualAddress } from './helpers/derive-address-from-public-key'
 import { createPublicKeyHash } from './helpers/create-public-key-hash'
 import { GatewayService } from './gateway'
-import type {
-  GatewayApiClient,
-  SignedChallenge,
-} from '@radixdlt/radix-dapp-toolkit'
+import type { GatewayApiClient } from '@radixdlt/babylon-gateway-api-sdk'
+import type { SignedChallenge } from './types'
 
 export { NetworkId } from '@radixdlt/radix-engine-toolkit'
-
-export type { SignedChallenge } from '@radixdlt/radix-dapp-toolkit'
 export type RolaError = { reason: string; jsError?: Error }
+export type * from './types'
 
 export type VerifyOwnerKeyOnLedgerFn = (
   address: string,

diff --git a/typescript/src/types.ts b/typescript/src/types.ts
@@ -0,0 +1,10 @@
+export type SignedChallenge = {
+  address: string
+  type: 'persona' | 'account'
+  challenge: string
+  proof: {
+    publicKey: string
+    signature: string
+    curve: 'curve25519' | 'secp256k1'
+  }
+}