Skip to content

Commit b9322cc

Browse files
just-a-nodejust-a-node
authored
Merge pull request #3826 from connext/main
v1.2.0-alpha.1
2 parents 736ecea + 65b86dd commit b9322cc

File tree

22 files changed

+36
-27
lines changed

22 files changed

+36
-27
lines changed

‎.github/workflows/build-test-deploy.yml

+6
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,12 @@ jobs:
7878
NODE_OPTIONS: "--max-old-space-size=8192"
7979
run: yarn lint:all
8080

81+
- name: Install jq
82+
run: sudo apt-get install -y jq
83+
84+
- name: Extract version from package.json
85+
run: echo "VERSION=$(cat package.json | jq -r '.version')" >> $GITHUB_ENV
86+
8187
- name: Determine tags based on version
8288
id: version_type
8389
run: |

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@connext/nxtp",
3-
"version": "1.2.0-alpha.0",
3+
"version": "1.2.0-alpha.1",
44
"private": true,
55
"devDependencies": {
66
"@istanbuljs/nyc-config-typescript": "1.0.2",

‎packages/adapters/cache/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@connext/nxtp-adapters-cache",
3-
"version": "1.2.0-alpha.0",
3+
"version": "1.2.0-alpha.1",
44
"description": "adapter for handling communication with Redis cache for nxtp protocol",
55
"main": "dist/index.js",
66
"types": "dist/index.d.ts",

‎packages/adapters/database/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@connext/nxtp-adapters-database",
3-
"version": "1.2.0-alpha.0",
3+
"version": "1.2.0-alpha.1",
44
"description": "adapter for handling communication with Redis cache for nxtp protocol",
55
"main": "dist/index.js",
66
"types": "dist/index.d.ts",

‎packages/adapters/relayer/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@connext/nxtp-adapters-relayer",
3-
"version": "1.2.0-alpha.0",
3+
"version": "1.2.0-alpha.1",
44
"description": "adapter for handling communication with relayer",
55
"main": "dist/index.js",
66
"types": "dist/index.d.ts",

‎packages/adapters/subgraph/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@connext/nxtp-adapters-subgraph",
3-
"version": "1.2.0-alpha.0",
3+
"version": "1.2.0-alpha.1",
44
"description": "adapter for subgraph interaction of nxtp protocol",
55
"main": "dist/src/index.js",
66
"types": "dist/src/index.d.ts",

‎packages/adapters/txservice/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@connext/nxtp-txservice",
3-
"version": "1.2.0-alpha.0",
3+
"version": "1.2.0-alpha.1",
44
"description": "Robust transaction sending service for a wallet configured across multiple chains. Will bump gas and reattempt transactions as needed",
55
"author": "Connext",
66
"license": "MIT",

‎packages/adapters/watcher/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@connext/nxtp-adapters-watcher",
3-
"version": "1.2.0-alpha.0",
3+
"version": "1.2.0-alpha.1",
44
"description": "adapter for watcher related calls, monitoring, and functionality",
55
"main": "dist/index.js",
66
"types": "dist/index.d.ts",

‎packages/adapters/web3signer/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@connext/nxtp-adapters-web3signer",
3-
"version": "1.2.0-alpha.0",
3+
"version": "1.2.0-alpha.1",
44
"description": "adapter for subgraph interaction of nxtp protocol",
55
"main": "dist/index.js",
66
"types": "dist/index.d.ts",

‎packages/agents/cartographer/poller/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@connext/cartographer-poller",
3-
"version": "1.2.0-alpha.0",
3+
"version": "1.2.0-alpha.1",
44
"description": "",
55
"types": "dist/index.d.ts",
66
"files": [

‎packages/agents/lighthouse/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@connext/lighthouse",
3-
"version": "1.2.0-alpha.0",
3+
"version": "1.2.0-alpha.1",
44
"description": "",
55
"main": "dist/index.js",
66
"types": "dist/index.d.ts",

‎packages/agents/relayer/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@connext/nxtp-relayer",
3-
"version": "1.2.0-alpha.0",
3+
"version": "1.2.0-alpha.1",
44
"description": "Generic relayer agent for Amarok",
55
"author": "Connext",
66
"license": "MIT",

‎packages/agents/router/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@connext/nxtp-router",
3-
"version": "1.2.0-alpha.0",
3+
"version": "1.2.0-alpha.1",
44
"description": "",
55
"main": "dist/index.js",
66
"types": "dist/index.d.ts",

‎packages/agents/sdk/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@connext/sdk",
3-
"version": "1.2.0-alpha.0",
3+
"version": "1.2.0-alpha.1",
44
"description": "Client-side package for interacting with the NXTP protocol for crosschain packages",
55
"author": "Connext",
66
"license": "MIT",

‎packages/agents/sequencer/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@connext/nxtp-sequencer",
3-
"version": "1.2.0-alpha.0",
3+
"version": "1.2.0-alpha.1",
44
"description": "Sequencer for Amarok, previously auctioneer",
55
"author": "Connext",
66
"license": "MIT",

‎packages/agents/watcher/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@connext/nxtp-watcher",
3-
"version": "1.2.0-alpha.0",
3+
"version": "1.2.0-alpha.1",
44
"description": "",
55
"types": "dist/index.d.ts",
66
"files": [

‎packages/deployments/contracts/package.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@connext/smart-contracts",
3-
"version": "1.2.0-alpha.0",
3+
"version": "1.2.0-alpha.1",
44
"description": "",
55
"scripts": {
66
"test": "yarn forge test --no-match-path '*/upgrade/**.sol'",
@@ -41,10 +41,12 @@
4141
],
4242
"author": "Connext",
4343
"license": "ISC",
44+
"dependencies": {
45+
"@eth-optimism/sdk": "1.6.9"
46+
},
4447
"devDependencies": {
4548
"@arbitrum/sdk": "3.0.0-beta.12",
4649
"@connext/nxtp-utils": "workspace:*",
47-
"@eth-optimism/sdk": "1.6.9",
4850
"@gelatonetwork/relay-context": "2.1.0",
4951
"@matterlabs/hardhat-zksync-deploy": "^0.6.1",
5052
"@matterlabs/hardhat-zksync-solc": "^0.3.14",

‎packages/deployments/contracts/src/cli/init/config/mainnet/production.ts

+1
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ export const MAINNET_PRODUCTION_INIT_CONFIG: InitConfig = {
154154
},
155155
routers: {
156156
allowlist: [
157+
"0xbe7bc00382a50a711d037eaecad799bb8805dfa8", // Minerva
157158
"0x63Cda9C42db542bb91a7175E38673cFb00D402b0", // Consensys Mesh
158159
"0xF26c772C0fF3a6036bDdAbDAbA22cf65ECa9F97c", // Connext
159160
"0x97b9dcB1AA34fE5F12b728D9166ae353d1e7f5C4", // P2P

‎packages/deployments/contracts/src/cli/init/helpers/tx.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ export const updateIfNeeded = async <T>(schema: CallSchema<T>): Promise<void> =>
8686
const writeCall = async (chain: number): Promise<providers.TransactionResponse> => {
8787
if (chain === 137) {
8888
return await contract[write.method](...write.args, {
89-
gasLimit: 2000000,
90-
gasPrice: "100000000000",
89+
gasLimit: 5000000,
90+
gasPrice: "500000000000",
9191
});
9292
} else if (chain == 280) {
9393
return await contract[write.method](...write.args, {

‎packages/deployments/subgraph/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@connext/nxtp-subgraph",
3-
"version": "1.2.0-alpha.0",
3+
"version": "1.2.0-alpha.1",
44
"license": "UNLICENSED",
55
"scripts": {
66
"graph": "graph",

‎packages/integration/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@connext/nxtp-integration",
3-
"version": "1.2.0-alpha.0",
3+
"version": "1.2.0-alpha.1",
44
"description": "Integration tests for NXTP",
55
"author": "Connext",
66
"license": "MIT",

‎packages/utils/package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@connext/nxtp-utils",
3-
"version": "1.2.0-alpha.0",
3+
"version": "1.2.0-alpha.1",
44
"description": "Common utilities for use within the @connext/nxtp-* packages",
55
"author": "Connext",
66
"license": "MIT",
@@ -28,11 +28,15 @@
2828
"ajv": "8.12.0",
2929
"ajv-formats": "2.1.1",
3030
"axios": "1.3.3",
31+
"chai": "4.3.7",
32+
"chai-as-promised": "7.1.1",
33+
"chai-subset": "1.6.0",
3134
"ethers": "5.7.2",
3235
"hyperid": "3.1.1",
3336
"merkletreejs": "0.3.9",
3437
"pino": "8.10.0",
35-
"secp256k1": "4.0.3"
38+
"secp256k1": "4.0.3",
39+
"sinon-chai": "3.7.0"
3640
},
3741
"devDependencies": {
3842
"@types/chai": "4.3.4",
@@ -44,15 +48,11 @@
4448
"@types/sinon": "10.0.13",
4549
"@types/sinon-chai": "3.2.9",
4650
"@typescript-eslint/eslint-plugin": "5.52.0",
47-
"chai": "4.3.7",
48-
"chai-as-promised": "7.1.1",
49-
"chai-subset": "1.6.0",
5051
"eslint": "8.34.0",
5152
"mocha": "10.2.0",
5253
"nyc": "15.1.0",
5354
"rimraf": "3.0.2",
5455
"sinon": "15.0.1",
55-
"sinon-chai": "3.7.0",
5656
"ts-mocha": "10.0.0",
5757
"tslib": "2.5.0",
5858
"typescript": "4.9.5"

0 commit comments

Comments
 (0)