Skip to content

Commit

Permalink
Merge pull request #98 from CityOfZion/CU-86dunk072
Browse files Browse the repository at this point in the history 
CU-86dunk072 - Swap Multi Invoke - Fixes for the swap between bNEO an…
  • Loading branch information
@raulduartep
raulduartep authored Sep 20, 2024
2 parents 96c1304 + 9158e48 commit 0799006
Show file tree
Hide file tree
Showing 18 changed files with 619 additions and 96 deletions.
10 changes: 10 additions & 0 deletions common/changes/@cityofzion/bs-neo3/CU-86dunk072_2024-09-18-21-09.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@cityofzion/bs-neo3",
"comment": "Including wrap logic",
"type": "patch"
}
],
"packageName": "@cityofzion/bs-neo3"
}
260 changes: 255 additions & 5 deletions packages/bs-neo3/src/__tests__/builder/invocation/FlamingoSwapInvocationBuilderNeo3.spec.ts
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Network, SwapServiceSwapToReceiveArgs, SwapServiceSwapToUseArgs } from '@cityofzion/blockchain-service'
import { ContractInvocationMulti } from '@cityofzion/neon-dappkit-types'
import { FlamingoSwapInvocationBuilderNeo3 } from '../../../builder/invocation/FlamingoSwapInvocationBuilderNeo3'
import { FlamingoSwapConstants } from '../../../constants/FlamingoSwapConstants'
import { BSNeo3Constants, BSNeo3NetworkId } from '../../../constants/BSNeo3Constants'
import { FlamingoSwapConstants } from '../../../constants/FlamingoSwapConstants'

let network: Network<BSNeo3NetworkId>

Expand All @@ -11,7 +11,7 @@ describe('FlamingoSwapInvocationBuilderNeo3', () => {
network = BSNeo3Constants.DEFAULT_NETWORK
})

it('Should match the invocation script swapping NEO to GAS - swapTokenToUse', () => {
it('Should match the invocation script swapping NEO to GAS (Swap Wrapping) - swapTokenToUse', () => {
const NEO = FlamingoSwapConstants.FLAMINGO_SWAP_TOKENS[network.id]['NEO']
const bNEO = FlamingoSwapConstants.FLAMINGO_SWAP_TOKENS[network.id]['bNEO']
const GAS = FlamingoSwapConstants.FLAMINGO_SWAP_TOKENS[network.id]['GAS']
Expand Down Expand Up @@ -92,7 +92,6 @@ describe('FlamingoSwapInvocationBuilderNeo3', () => {
{
scopes: 16,
allowedContracts: [
'0x3244fcadcccff190c329f7b3083e4da2af60fbce',
'0xf970f4ccecd765b63732b821775dc38c25d74f23',
'0xca2d20610d7982ebe0bed124ee7e9b2d580a6efc',
'0xfb75a5314069b56e136713d38477f647a13991b4',
Expand All @@ -107,7 +106,133 @@ describe('FlamingoSwapInvocationBuilderNeo3', () => {
expect(response).toEqual(expectedResponse)
})

it('Should match the invocation script swapping GAS to NEO - swapTokenToReceive', () => {
it('Should match the invocation script swapping NEO to bNEO (Wrap NEO) - swapTokenToUse', () => {
const NEO = FlamingoSwapConstants.FLAMINGO_SWAP_TOKENS[network.id]['NEO']
const bNEO = FlamingoSwapConstants.FLAMINGO_SWAP_TOKENS[network.id]['bNEO']

const data: SwapServiceSwapToUseArgs<BSNeo3NetworkId> = {
address: 'address',
amountToUse: '1',
deadline: '10',
minimumReceived: '1',
network,
routePath: [NEO, bNEO],
type: 'swapTokenToUse',
}

const response = FlamingoSwapInvocationBuilderNeo3.swapInvocation(data)

const expectedResponse: ContractInvocationMulti = {
invocations: [
{
scriptHash: '0xef4073a0f2b305a38ec4050e4d3d28bc40ea63f5',
operation: 'transfer',
args: [
{
type: 'Hash160',
value: data.address,
},
{
type: 'Hash160',
value: '0x48c40d4666f93408be1bef038b6722404d9a4c2a',
},
{
type: 'Integer',
value: '1',
},
{
type: 'Any',
value: null,
},
],
},
],
signers: [
{
scopes: 16,
allowedContracts: [
'0xef4073a0f2b305a38ec4050e4d3d28bc40ea63f5',
'0x48c40d4666f93408be1bef038b6722404d9a4c2a',
],
},
],
}

expect(response).toEqual(expectedResponse)
})

it('Should match the invocation script swapping FLM to GAS (Simple swap) - swapTokenToUse', () => {
const FLM = FlamingoSwapConstants.FLAMINGO_SWAP_TOKENS[network.id]['FLM']
const GAS = FlamingoSwapConstants.FLAMINGO_SWAP_TOKENS[network.id]['GAS']

const data: SwapServiceSwapToUseArgs<BSNeo3NetworkId> = {
address: 'address',
amountToUse: '1',
deadline: '10',
minimumReceived: '0.01638157',
network,
routePath: [FLM, GAS],
type: 'swapTokenToUse',
}

const response = FlamingoSwapInvocationBuilderNeo3.swapInvocation(data)

const expectedResponse: ContractInvocationMulti = {
invocations: [
{
scriptHash: '0xf970f4ccecd765b63732b821775dc38c25d74f23',
operation: 'swapTokenInForTokenOut',
args: [
{
type: 'Hash160',
value: data.address,
},
{
type: 'Integer',
value: '100000000',
},
{
type: 'Integer',
value: '1638157',
},
{
type: 'Array',
value: [
{
type: 'Hash160',
value: '0xf0151f528127558851b39c2cd8aa47da7418ab28',
},
{
type: 'Hash160',
value: '0xd2a4cff31913016155e38e474a2c06d08be276cf',
},
],
},
{
type: 'Integer',
value: expect.any(String),
},
],
},
],
signers: [
{
scopes: 16,
allowedContracts: [
'0xf970f4ccecd765b63732b821775dc38c25d74f23',
'0xca2d20610d7982ebe0bed124ee7e9b2d580a6efc',
'0xfb75a5314069b56e136713d38477f647a13991b4',
'0xf0151f528127558851b39c2cd8aa47da7418ab28',
'0xd2a4cff31913016155e38e474a2c06d08be276cf',
],
},
],
}

expect(response).toEqual(expectedResponse)
})

it('Should match the invocation script swapping GAS to NEO (Swap Unwrapping) - swapTokenToReceive', () => {
const NEO = FlamingoSwapConstants.FLAMINGO_SWAP_TOKENS[network.id]['NEO']
const bNEO = FlamingoSwapConstants.FLAMINGO_SWAP_TOKENS[network.id]['bNEO']
const GAS = FlamingoSwapConstants.FLAMINGO_SWAP_TOKENS[network.id]['GAS']
Expand Down Expand Up @@ -194,7 +319,132 @@ describe('FlamingoSwapInvocationBuilderNeo3', () => {
'0xd2a4cff31913016155e38e474a2c06d08be276cf',
'0x48c40d4666f93408be1bef038b6722404d9a4c2a',
'0xef4073a0f2b305a38ec4050e4d3d28bc40ea63f5',
'0x3244fcadcccff190c329f7b3083e4da2af60fbce',
],
},
],
}

expect(response).toEqual(expectedResponse)
})

it('Should match the invocation script swapping bNEO to NEO (Unwrap NEO) - swapTokenToReceive', () => {
const NEO = FlamingoSwapConstants.FLAMINGO_SWAP_TOKENS[network.id]['NEO']
const bNEO = FlamingoSwapConstants.FLAMINGO_SWAP_TOKENS[network.id]['bNEO']

const data: SwapServiceSwapToReceiveArgs<BSNeo3NetworkId> = {
address: 'address',
amountToReceive: '1',
deadline: '10',
maximumSelling: '1',
network,
routePath: [bNEO, NEO],
type: 'swapTokenToReceive',
}

const response = FlamingoSwapInvocationBuilderNeo3.swapInvocation(data)

const expectedResponse: ContractInvocationMulti = {
invocations: [
{
scriptHash: '0xd2a4cff31913016155e38e474a2c06d08be276cf',
operation: 'transfer',
args: [
{
type: 'Hash160',
value: data.address,
},
{
type: 'Hash160',
value: '0x48c40d4666f93408be1bef038b6722404d9a4c2a',
},
{
type: 'Integer',
value: '100000',
},
{
type: 'Any',
value: null,
},
],
},
],
signers: [
{
scopes: 16,
allowedContracts: [
'0xd2a4cff31913016155e38e474a2c06d08be276cf',
'0x48c40d4666f93408be1bef038b6722404d9a4c2a',
],
},
],
}

expect(response).toEqual(expectedResponse)
})

it('Should match the invocation script swapping GAS to FLM (Simple Swap) - swapTokenToReceive', () => {
const GAS = FlamingoSwapConstants.FLAMINGO_SWAP_TOKENS[network.id]['GAS']
const FLM = FlamingoSwapConstants.FLAMINGO_SWAP_TOKENS[network.id]['FLM']

const data: SwapServiceSwapToReceiveArgs<BSNeo3NetworkId> = {
address: 'address',
amountToReceive: '1',
deadline: '10',
maximumSelling: '61.0444685',
network,
routePath: [GAS, FLM],
type: 'swapTokenToReceive',
}

const response = FlamingoSwapInvocationBuilderNeo3.swapInvocation(data)

const expectedResponse: ContractInvocationMulti = {
invocations: [
{
scriptHash: '0xf970f4ccecd765b63732b821775dc38c25d74f23',
operation: 'swapTokenOutForTokenIn',
args: [
{
type: 'Hash160',
value: data.address,
},
{
type: 'Integer',
value: '100000000',
},
{
type: 'Integer',
value: '6104446850',
},
{
type: 'Array',
value: [
{
type: 'Hash160',
value: '0xd2a4cff31913016155e38e474a2c06d08be276cf',
},
{
type: 'Hash160',
value: '0xf0151f528127558851b39c2cd8aa47da7418ab28',
},
],
},
{
type: 'Integer',
value: expect.any(String),
},
],
},
],
signers: [
{
scopes: 16,
allowedContracts: [
'0xf970f4ccecd765b63732b821775dc38c25d74f23',
'0xca2d20610d7982ebe0bed124ee7e9b2d580a6efc',
'0xfb75a5314069b56e136713d38477f647a13991b4',
'0xd2a4cff31913016155e38e474a2c06d08be276cf',
'0xf0151f528127558851b39c2cd8aa47da7418ab28',
],
},
],
Expand Down
2 changes: 1 addition & 1 deletion packages/bs-neo3/src/__tests__/helpers/FlamingoSwapHelper.spec.ts
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Network, SwapRoute } from '@cityofzion/blockchain-service'
import BigNumber from 'bignumber.js'
import { BSNeo3Constants, BSNeo3NetworkId } from '../../constants/BSNeo3Constants'
import { FlamingoSwapConstants } from '../../constants/FlamingoSwapConstants'
import { FlamingoSwapHelper } from '../../helpers/FlamingoSwapHelper'
import { BSNeo3Constants, BSNeo3NetworkId } from '../../constants/BSNeo3Constants'

let network: Network<BSNeo3NetworkId>

Expand Down
2 changes: 1 addition & 1 deletion packages/bs-neo3/src/__tests__/services/exchange-data/FlamingoEDSNeo3.spec.ts
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Network } from '@cityofzion/blockchain-service'
import { FlamingoEDSNeo3 } from '../../../services/exchange-data/FlamingoEDSNeo3'
import { BSNeo3Constants, BSNeo3NetworkId } from '../../../constants/BSNeo3Constants'
import { BSNeo3Helper } from '../../../helpers/BSNeo3Helper'
import { FlamingoEDSNeo3 } from '../../../services/exchange-data/FlamingoEDSNeo3'

let flamingoEDSNeo3: FlamingoEDSNeo3
let network: Network<BSNeo3NetworkId>
Expand Down
4 changes: 2 additions & 2 deletions packages/bs-neo3/src/__tests__/services/swap/FlamingoSwapServiceNeo3.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import {
SwapServiceSwapToUseArgs,
Token,
} from '@cityofzion/blockchain-service'
import { BSNeo3 } from '../../../BSNeo3'
import { BSNeo3Constants, BSNeo3NetworkId } from '../../../constants/BSNeo3Constants'
import { FlamingoSwapConstants } from '../../../constants/FlamingoSwapConstants'
import { FlamingoSwapServiceNeo3 } from '../../../services/swap/FlamingoSwapServiceNeo3'
import { BSNeo3Constants, BSNeo3NetworkId } from '../../../constants/BSNeo3Constants'
import { BSNeo3 } from '../../../BSNeo3'

let flamingoSwapServiceNeo3: FlamingoSwapServiceNeo3
let network: Network<BSNeo3NetworkId>
Expand Down
2 changes: 1 addition & 1 deletion packages/bs-neo3/src/__tests__/services/swap/handlers/FlamingoSwapDetailsHandler.spec.ts
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Network } from '@cityofzion/blockchain-service'
import { BSNeo3Constants, BSNeo3NetworkId } from '../../../../constants/BSNeo3Constants'
import { FlamingoSwapHelper } from '../../../../helpers/FlamingoSwapHelper'
import { FlamingoSwapDetailsHandler } from '../../../../services/swap/handlers'
import { BSNeo3Constants, BSNeo3NetworkId } from '../../../../constants/BSNeo3Constants'

let network: Network<BSNeo3NetworkId>

Expand Down
2 changes: 1 addition & 1 deletion packages/bs-neo3/src/__tests__/services/swap/handlers/FlamingoSwapRouteHandler.spec.ts
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Network, SwapRoute } from '@cityofzion/blockchain-service'
import { BSNeo3Constants, BSNeo3NetworkId } from '../../../../constants/BSNeo3Constants'
import { FlamingoSwapHelper } from '../../../../helpers/FlamingoSwapHelper'
import { FlamingoSwapRouteHandler } from '../../../../services/swap/handlers'
import { BSNeo3Constants, BSNeo3NetworkId } from '../../../../constants/BSNeo3Constants'

let network: Network<BSNeo3NetworkId>

Expand Down
Loading

0 comments on commit 0799006

Please sign in to comment.