Merge pull request #171 from UniqueNetwork/develop

Release 3.1.0
UniqueNetwork · Jun 20, 2024 · 05d5e08 · 05d5e08
2 parents 9699474 + db90824
commit 05d5e08
Show file tree

Hide file tree

Showing 32 changed files with 10,407 additions and 9,331 deletions.
diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
@@ -22,7 +22,7 @@ jobs:
     uses: UniqueNetwork/unique-marketplace-backend/.github/workflows/build-docker-image.yml@master
     secrets: inherit
     with:
-      tag: unique-marketplace-backend
+      tag: ${{ github.event.inputs.tag }}
       dockerfile: ./Dockerfile
       is_latest: ${{ github.event.inputs.is_latest }}
 

diff --git a/.husky/.gitignore b/.husky/.gitignore
diff --git a/.husky/commit-msg b/.husky/commit-msg
diff --git a/.husky/pre-commit b/.husky/pre-commit
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,23 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "ts-node",
+      "type": "node",
+      "request": "launch",
+      "args": ["${relativeFile}"],
+      "runtimeArgs": ["-r", "ts-node/register"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    },
+    {
+      "name": "Hardhat individual test",
+      "type": "node",
+      "request": "launch",
+      "console": "integratedTerminal",
+      "runtimeExecutable": "yarn",
+      "runtimeArgs": ["testhh", "${file}"]
+    }
+  ]
+}
diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -1,7 +1,8 @@
-import { HardhatUserConfig, task } from 'hardhat/config';
 import '@nomicfoundation/hardhat-toolbox';
+import { HardhatUserConfig, task } from 'hardhat/config';
 import { loadConfig } from './packages/contracts/scripts';
 import { buildVersion } from './packages/contracts/tasks';
+import testConfig from './packages/contracts/test/utils/testConfig';
 
 const appConfig = loadConfig();
 
@@ -24,6 +25,10 @@ const config: HardhatUserConfig = {
       url: appConfig.opal.rpcUrl,
       accounts: appConfig.accounts,
     },
+    test: {
+      url: testConfig.ethRpcUrl,
+      accounts: testConfig.ethPrivateKeys,
+    }
   },
   mocha: {
     timeout: 100000000,