diff --git a/package-lock.json b/package-lock.json index aebbd2f..6dfe9b2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,19 +1,18 @@ { "name": "@orionprotocol/sdk", - "version": "0.22.3", + "version": "0.23.0-rc0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@orionprotocol/sdk", - "version": "0.22.3", + "version": "0.23.0-rc0", "hasInstallScript": true, "license": "ISC", "dependencies": { "@babel/runtime": "^7.21.0", - "@ethersproject/abstract-signer": "^5.7.0", "@ethersproject/providers": "^5.7.2", - "@orionprotocol/contracts": "^1.23.9", + "@orionprotocol/contracts": "1.23.4-rc", "@types/lodash.clonedeep": "^4.5.9", "bignumber.js": "^9.1.1", "bson-objectid": "^2.0.4", @@ -27,7 +26,7 @@ "merge-anything": "^5.1.7", "neverthrow": "^6.0.0", "patch-package": "^8.0.0", - "simple-typed-fetch": "0.2.3", + "simple-typed-fetch": "0.2.5", "stream-browserify": "^3.0.0", "tiny-invariant": "^1.3.1", "ts-is-present": "^1.2.2", @@ -2422,9 +2421,9 @@ } }, "node_modules/@orionprotocol/contracts": { - "version": "1.23.9", - "resolved": "https://registry.npmjs.org/@orionprotocol/contracts/-/contracts-1.23.9.tgz", - "integrity": "sha512-tx21XokSK8kBYmuzfYrXoDattirm6yaG3dslrOKZTHgGP1wC6c6SbQF69pVCCAnPNGvQCt4lw0I/8fxm9Cx23Q==" + "version": "1.23.4-rc", + "resolved": "https://registry.npmjs.org/@orionprotocol/contracts/-/contracts-1.23.4-rc.tgz", + "integrity": "sha512-Cd5oMVZzMuQbOqbVBnwUbLXr6jpwOq4MtwoLo/l6T1BxWh/s1hKF8VuIvUJgGbzI0HEg3AGa1DCT4chwe9721Q==" }, "node_modules/@sinclair/typebox": { "version": "0.27.8", @@ -10399,9 +10398,9 @@ "dev": true }, "node_modules/simple-typed-fetch": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/simple-typed-fetch/-/simple-typed-fetch-0.2.3.tgz", - "integrity": "sha512-EXP2mVVsVf4A3+5QGevs8789ztnT6FozsYyMrIrUYhfqtX2V+X9xETHeGXffmgv7YQ0p+GrW7N+5x+b+pBW59Q==", + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/simple-typed-fetch/-/simple-typed-fetch-0.2.5.tgz", + "integrity": "sha512-T/KKUHKOZgaYVp3dbjE1wEK5cAGmG5N7FNAzP6ZGqLDhzBsRm3Gpt8bO/kowV6bt8duXDWiapYFQibW/8iHp6Q==", "dependencies": { "isomorphic-unfetch": "^4.0.2", "neverthrow": "^6.0.0", @@ -13489,9 +13488,9 @@ } }, "@orionprotocol/contracts": { - "version": "1.23.9", - "resolved": "https://registry.npmjs.org/@orionprotocol/contracts/-/contracts-1.23.9.tgz", - "integrity": "sha512-tx21XokSK8kBYmuzfYrXoDattirm6yaG3dslrOKZTHgGP1wC6c6SbQF69pVCCAnPNGvQCt4lw0I/8fxm9Cx23Q==" + "version": "1.23.4-rc", + "resolved": "https://registry.npmjs.org/@orionprotocol/contracts/-/contracts-1.23.4-rc.tgz", + "integrity": "sha512-Cd5oMVZzMuQbOqbVBnwUbLXr6jpwOq4MtwoLo/l6T1BxWh/s1hKF8VuIvUJgGbzI0HEg3AGa1DCT4chwe9721Q==" }, "@sinclair/typebox": { "version": "0.27.8", @@ -19336,9 +19335,9 @@ "dev": true }, "simple-typed-fetch": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/simple-typed-fetch/-/simple-typed-fetch-0.2.3.tgz", - "integrity": "sha512-EXP2mVVsVf4A3+5QGevs8789ztnT6FozsYyMrIrUYhfqtX2V+X9xETHeGXffmgv7YQ0p+GrW7N+5x+b+pBW59Q==", + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/simple-typed-fetch/-/simple-typed-fetch-0.2.5.tgz", + "integrity": "sha512-T/KKUHKOZgaYVp3dbjE1wEK5cAGmG5N7FNAzP6ZGqLDhzBsRm3Gpt8bO/kowV6bt8duXDWiapYFQibW/8iHp6Q==", "requires": { "isomorphic-unfetch": "^4.0.2", "neverthrow": "^6.0.0", diff --git a/src/constants/orderStatuses.ts b/src/constants/orderStatuses.ts index ebe42d6..2cfb894 100644 --- a/src/constants/orderStatuses.ts +++ b/src/constants/orderStatuses.ts @@ -3,7 +3,8 @@ import subOrderStatuses from './subOrderStatuses.js'; const orderStatuses = [ ...subOrderStatuses, 'ROUTING', // order got sub orders, but not all of them have status ACCEPTED - 'TRANSFER' // TX_PENDING > TRANSFER > SETTLED + 'TRANSFER', // TX_PENDING > TRANSFER > SETTLED + 'REFUNDED' // TX_PENDING > TRANSFER > CANCELED > REFUNDED ] as const; export default orderStatuses; diff --git a/src/services/Aggregator/ws/schemas/addressUpdateSchema.ts b/src/services/Aggregator/ws/schemas/addressUpdateSchema.ts index bd60d08..7e164d0 100644 --- a/src/services/Aggregator/ws/schemas/addressUpdateSchema.ts +++ b/src/services/Aggregator/ws/schemas/addressUpdateSchema.ts @@ -86,6 +86,8 @@ export const fullOrderSchema = z.object({ ro: z.boolean().optional(), // is reversed order sc: z.string().optional(), // source chain tc: z.string().optional(), // target chain + ir: z.string().optional(), // is refundable + sh: z.string().optional(), // secret hash }).transform((val) => ({ ...val, k: 'full' as const, @@ -109,6 +111,7 @@ export const fullOrderSchema = z.object({ isReversedOrder: o.ro, sourceChain: o.sc, targetChain: o.tc, + isRefundable: o.ir, subOrders: o.c.map((so) => ({ pair: so.P, exchange: so.e,