Skip to content

Commit 05d5e08

Browse files
authored
Merge pull request #171 from UniqueNetwork/develop
Release 3.1.0
2 parents 9699474 + db90824 commit 05d5e08

32 files changed

Lines changed: 10407 additions & 9331 deletions

.github/workflows/build-and-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: UniqueNetwork/unique-marketplace-backend/.github/workflows/build-docker-image.yml@master
2323
secrets: inherit
2424
with:
25-
tag: unique-marketplace-backend
25+
tag: ${{ github.event.inputs.tag }}
2626
dockerfile: ./Dockerfile
2727
is_latest: ${{ github.event.inputs.is_latest }}
2828

.husky/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

.husky/commit-msg

Lines changed: 0 additions & 19 deletions
This file was deleted.

.husky/pre-commit

Lines changed: 0 additions & 4 deletions
This file was deleted.

.vscode/launch.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"version": "0.2.0",
3+
"configurations": [
4+
{
5+
"name": "ts-node",
6+
"type": "node",
7+
"request": "launch",
8+
"args": ["${relativeFile}"],
9+
"runtimeArgs": ["-r", "ts-node/register"],
10+
"cwd": "${workspaceRoot}",
11+
"protocol": "inspector",
12+
"internalConsoleOptions": "openOnSessionStart"
13+
},
14+
{
15+
"name": "Hardhat individual test",
16+
"type": "node",
17+
"request": "launch",
18+
"console": "integratedTerminal",
19+
"runtimeExecutable": "yarn",
20+
"runtimeArgs": ["testhh", "${file}"]
21+
}
22+
]
23+
}

hardhat.config.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import { HardhatUserConfig, task } from 'hardhat/config';
21
import '@nomicfoundation/hardhat-toolbox';
2+
import { HardhatUserConfig, task } from 'hardhat/config';
33
import { loadConfig } from './packages/contracts/scripts';
44
import { buildVersion } from './packages/contracts/tasks';
5+
import testConfig from './packages/contracts/test/utils/testConfig';
56

67
const appConfig = loadConfig();
78

@@ -24,6 +25,10 @@ const config: HardhatUserConfig = {
2425
url: appConfig.opal.rpcUrl,
2526
accounts: appConfig.accounts,
2627
},
28+
test: {
29+
url: testConfig.ethRpcUrl,
30+
accounts: testConfig.ethPrivateKeys,
31+
}
2732
},
2833
mocha: {
2934
timeout: 100000000,

0 commit comments

Comments
 (0)