diff --git a/.yarn/cache/@synthetixio-router-npm-3.1.3-813f811145-bf2d8db9f8.zip b/.yarn/cache/@synthetixio-router-npm-3.1.4-97d58f1412-da369169a1.zip similarity index 59% rename from .yarn/cache/@synthetixio-router-npm-3.1.3-813f811145-bf2d8db9f8.zip rename to .yarn/cache/@synthetixio-router-npm-3.1.4-97d58f1412-da369169a1.zip index 4a39e678c3..b737c96147 100644 Binary files a/.yarn/cache/@synthetixio-router-npm-3.1.3-813f811145-bf2d8db9f8.zip and b/.yarn/cache/@synthetixio-router-npm-3.1.4-97d58f1412-da369169a1.zip differ diff --git a/.yarn/cache/@usecannon-builder-npm-2.4.19-8bf1bb7f47-1ec415fa4f.zip b/.yarn/cache/@usecannon-builder-npm-2.4.20-c88eae7630-342818635e.zip similarity index 69% rename from .yarn/cache/@usecannon-builder-npm-2.4.19-8bf1bb7f47-1ec415fa4f.zip rename to .yarn/cache/@usecannon-builder-npm-2.4.20-c88eae7630-342818635e.zip index a79a2a83cd..ced975ca0c 100644 Binary files a/.yarn/cache/@usecannon-builder-npm-2.4.19-8bf1bb7f47-1ec415fa4f.zip and b/.yarn/cache/@usecannon-builder-npm-2.4.20-c88eae7630-342818635e.zip differ diff --git a/.yarn/cache/@usecannon-cli-npm-2.4.19-42a098c4cc-78c5691c12.zip b/.yarn/cache/@usecannon-cli-npm-2.4.20-0858c1dc0e-39fa135e5d.zip similarity index 93% rename from .yarn/cache/@usecannon-cli-npm-2.4.19-42a098c4cc-78c5691c12.zip rename to .yarn/cache/@usecannon-cli-npm-2.4.20-0858c1dc0e-39fa135e5d.zip index be27f18233..c071703bc1 100644 Binary files a/.yarn/cache/@usecannon-cli-npm-2.4.19-42a098c4cc-78c5691c12.zip and b/.yarn/cache/@usecannon-cli-npm-2.4.20-0858c1dc0e-39fa135e5d.zip differ diff --git a/.yarn/cache/cannon-plugin-router-npm-1.0.12-7be941a212-83eb3d5638.zip b/.yarn/cache/cannon-plugin-router-npm-1.0.12-7be941a212-83eb3d5638.zip deleted file mode 100644 index 9336deba49..0000000000 Binary files a/.yarn/cache/cannon-plugin-router-npm-1.0.12-7be941a212-83eb3d5638.zip and /dev/null differ diff --git a/.yarn/cache/cannon-plugin-router-npm-1.0.15-71b2d7f40d-4b4678f8b0.zip b/.yarn/cache/cannon-plugin-router-npm-1.0.15-71b2d7f40d-4b4678f8b0.zip new file mode 100644 index 0000000000..589a18dd30 Binary files /dev/null and b/.yarn/cache/cannon-plugin-router-npm-1.0.15-71b2d7f40d-4b4678f8b0.zip differ diff --git a/markets/perps-market/package.json b/markets/perps-market/package.json index c0a7955f9c..624d293c7a 100644 --- a/markets/perps-market/package.json +++ b/markets/perps-market/package.json @@ -33,7 +33,7 @@ "@synthetixio/router": "^3.1.3", "@synthetixio/spot-market": "workspace:*", "@synthetixio/wei": "2.74.4", - "@usecannon/cli": "^2.4.17", + "@usecannon/cli": "^2.4.20", "ethers": "^5.7.2", "hardhat": "2.15.0", "solidity-docgen": "0.6.0-beta.35", diff --git a/markets/perps-market/subgraph/package.json b/markets/perps-market/subgraph/package.json index 6f52990a1a..7558d46413 100644 --- a/markets/perps-market/subgraph/package.json +++ b/markets/perps-market/subgraph/package.json @@ -4,6 +4,7 @@ "private": true, "version": "1.0.0", "scripts": { + "subgraphgen": "yarn prepare && graph codegen && prettier --write . && yarn codegen", "build": "yarn build:optimism-goerli", "auth": "graph auth --product hosted-service $V3_GRAPH_KEY", "prepare": "cp ./subgraph.base.yaml ./subgraph.yaml", diff --git a/markets/spot-market/hardhat.config.ts b/markets/spot-market/hardhat.config.ts index 4f064fbda8..20d62bd165 100644 --- a/markets/spot-market/hardhat.config.ts +++ b/markets/spot-market/hardhat.config.ts @@ -25,6 +25,9 @@ const config = { default: 'off', }, }, + mocha: { + timeout: 200_000, + }, }; export default config; diff --git a/markets/spot-market/package.json b/markets/spot-market/package.json index e22793492f..21d9716e75 100644 --- a/markets/spot-market/package.json +++ b/markets/spot-market/package.json @@ -34,7 +34,7 @@ "@synthetixio/router": "^3.1.3", "@synthetixio/wei": "2.74.4", "@types/node-fetch": "2.6.4", - "@usecannon/cli": "^2.4.17", + "@usecannon/cli": "^2.4.20", "ethers": "^5.7.2", "hardhat": "2.15.0", "node-fetch": "2.6.9", diff --git a/markets/spot-market/subgraph/generated/SpotMarketProxy/SpotMarketProxy.ts b/markets/spot-market/subgraph/generated/SpotMarketProxy/SpotMarketProxy.ts index 5af1ecd11c..992c61f615 100644 --- a/markets/spot-market/subgraph/generated/SpotMarketProxy/SpotMarketProxy.ts +++ b/markets/spot-market/subgraph/generated/SpotMarketProxy/SpotMarketProxy.ts @@ -568,6 +568,10 @@ export class OrderSettled__Params { get price(): BigInt { return this._event.parameters[6].value.toBigInt(); } + + get orderType(): i32 { + return this._event.parameters[7].value.toI32(); + } } export class OrderSettledFeesStruct extends ethereum.Tuple { diff --git a/markets/spot-market/subgraph/package.json b/markets/spot-market/subgraph/package.json index bccb2f5b85..2085280fac 100644 --- a/markets/spot-market/subgraph/package.json +++ b/markets/spot-market/subgraph/package.json @@ -4,6 +4,7 @@ "private": true, "version": "1.0.0", "scripts": { + "subgraphgen": "yarn deployments:optimism-goerli && yarn codegen", "deployments": "yarn deployments:optimism-mainnet && yarn deployments:optimism-goerli", "auth": "graph auth --product hosted-service $V3_GRAPH_KEY", "deployments:optimism-mainnet": "cannon inspect synthetix-spot-market:latest --chain-id 10 --write-deployments ./deployments/optimism-mainnet", @@ -23,7 +24,7 @@ "devDependencies": { "@graphprotocol/graph-cli": "^0.50.1", "@graphprotocol/graph-ts": "^0.30.0", - "@usecannon/cli": "^2.4.17", + "@usecannon/cli": "^2.4.20", "ethers": "^5.7.2", "prettier": "^2.8.8" } diff --git a/markets/spot-market/subgraph/subgraph.base.yaml b/markets/spot-market/subgraph/subgraph.base.yaml index 0f4ad9296d..4f579b139a 100644 --- a/markets/spot-market/subgraph/subgraph.base.yaml +++ b/markets/spot-market/subgraph/subgraph.base.yaml @@ -20,7 +20,7 @@ dataSources: - SettlementStrategy - SynthWrapped eventHandlers: - - event: OrderSettled(indexed uint128,indexed uint128,uint256,(uint256,uint256,int256,int256),uint256,indexed address,uint256) + - event: OrderSettled(indexed uint128,indexed uint128,uint256,(uint256,uint256,int256,int256),uint256,indexed address,uint256,uint8) handler: handleOrderSettled - event: SynthWrapped(indexed uint256,uint256,(uint256,uint256,int256,int256),uint256) handler: handleSynthWrapped diff --git a/package.json b/package.json index ad04a1d427..3fcdbbf901 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,8 @@ "publish:dev": "lerna publish --force-publish --canary --dist-tag dev --preid dev.$(git rev-parse --short HEAD)", "publish-contracts": "yarn workspaces foreach --verbose run publish-contracts", "prepublishOnly": "node ./prepublishOnly.js", - "docgen": "yarn workspaces foreach --verbose run docgen" + "docgen": "yarn workspaces foreach --verbose run docgen", + "subgraphgen": "yarn workspaces foreach --verbose run subgraphgen" }, "devDependencies": { "@ethersproject/abi": "^5.7.0", @@ -50,7 +51,7 @@ "@types/node": "18.11.10", "@typescript-eslint/eslint-plugin": "5.45.0", "@typescript-eslint/parser": "5.45.0", - "@usecannon/cli": "^2.4.19", + "@usecannon/cli": "^2.4.20", "eslint": "8.29.0", "eslint-config-prettier": "8.5.0", "eslint-plugin-no-only-tests": "3.1.0", diff --git a/protocol/synthetix/package.json b/protocol/synthetix/package.json index 66d7130427..5427dfe4fd 100644 --- a/protocol/synthetix/package.json +++ b/protocol/synthetix/package.json @@ -32,7 +32,7 @@ "@synthetixio/oracle-manager": "workspace:*", "@synthetixio/router": "^3.1.3", "@synthetixio/wei": "2.74.4", - "@usecannon/builder": "^2.4.16", + "@usecannon/builder": "^2.4.20", "ethers": "^5.7.2", "hardhat": "2.15.0", "solidity-ast": "0.4.46", diff --git a/protocol/synthetix/subgraph/generated/CoreProxy/CoreProxy.ts b/protocol/synthetix/subgraph/generated/CoreProxy/CoreProxy.ts index 7e53f1375f..2c5297168b 100644 --- a/protocol/synthetix/subgraph/generated/CoreProxy/CoreProxy.ts +++ b/protocol/synthetix/subgraph/generated/CoreProxy/CoreProxy.ts @@ -504,6 +504,32 @@ export class CollateralConfiguredConfigStruct extends ethereum.Tuple { } } +export class TransferCrossChainInitiated extends ethereum.Event { + get params(): TransferCrossChainInitiated__Params { + return new TransferCrossChainInitiated__Params(this); + } +} + +export class TransferCrossChainInitiated__Params { + _event: TransferCrossChainInitiated; + + constructor(event: TransferCrossChainInitiated) { + this._event = event; + } + + get destChainId(): BigInt { + return this._event.parameters[0].value.toBigInt(); + } + + get amount(): BigInt { + return this._event.parameters[1].value.toBigInt(); + } + + get sender(): Address { + return this._event.parameters[2].value.toAddress(); + } +} + export class IssuanceFeePaid extends ethereum.Event { get params(): IssuanceFeePaid__Params { return new IssuanceFeePaid__Params(this); @@ -1326,6 +1352,24 @@ export class RewardsDistributorRemoved__Params { } } +export class NewSupportedCrossChainNetwork extends ethereum.Event { + get params(): NewSupportedCrossChainNetwork__Params { + return new NewSupportedCrossChainNetwork__Params(this); + } +} + +export class NewSupportedCrossChainNetwork__Params { + _event: NewSupportedCrossChainNetwork; + + constructor(event: NewSupportedCrossChainNetwork) { + this._event = event; + } + + get newChainId(): BigInt { + return this._event.parameters[0].value.toBigInt(); + } +} + export class DelegationUpdated extends ethereum.Event { get params(): DelegationUpdated__Params { return new DelegationUpdated__Params(this); @@ -3168,6 +3212,60 @@ export class CoreProxy extends ethereum.SmartContract { return ethereum.CallResult.fromValue(value[0].toBigInt()); } + setSupportedCrossChainNetworks( + supportedNetworks: Array, + ccipSelectors: Array + ): BigInt { + let result = super.call( + 'setSupportedCrossChainNetworks', + 'setSupportedCrossChainNetworks(uint64[],uint64[]):(uint256)', + [ + ethereum.Value.fromUnsignedBigIntArray(supportedNetworks), + ethereum.Value.fromUnsignedBigIntArray(ccipSelectors), + ] + ); + + return result[0].toBigInt(); + } + + try_setSupportedCrossChainNetworks( + supportedNetworks: Array, + ccipSelectors: Array + ): ethereum.CallResult { + let result = super.tryCall( + 'setSupportedCrossChainNetworks', + 'setSupportedCrossChainNetworks(uint64[],uint64[]):(uint256)', + [ + ethereum.Value.fromUnsignedBigIntArray(supportedNetworks), + ethereum.Value.fromUnsignedBigIntArray(ccipSelectors), + ] + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + supportsInterface(interfaceId: Bytes): boolean { + let result = super.call('supportsInterface', 'supportsInterface(bytes4):(bool)', [ + ethereum.Value.fromFixedBytes(interfaceId), + ]); + + return result[0].toBoolean(); + } + + try_supportsInterface(interfaceId: Bytes): ethereum.CallResult { + let result = super.tryCall('supportsInterface', 'supportsInterface(bytes4):(bool)', [ + ethereum.Value.fromFixedBytes(interfaceId), + ]); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBoolean()); + } + getPosition( accountId: BigInt, poolId: BigInt, @@ -4098,6 +4196,68 @@ export class RegisterUnmanagedSystemCall__Outputs { } } +export class CcipReceiveCall extends ethereum.Call { + get inputs(): CcipReceiveCall__Inputs { + return new CcipReceiveCall__Inputs(this); + } + + get outputs(): CcipReceiveCall__Outputs { + return new CcipReceiveCall__Outputs(this); + } +} + +export class CcipReceiveCall__Inputs { + _call: CcipReceiveCall; + + constructor(call: CcipReceiveCall) { + this._call = call; + } + + get message(): CcipReceiveCallMessageStruct { + return changetype(this._call.inputValues[0].value.toTuple()); + } +} + +export class CcipReceiveCall__Outputs { + _call: CcipReceiveCall; + + constructor(call: CcipReceiveCall) { + this._call = call; + } +} + +export class CcipReceiveCallMessageStruct extends ethereum.Tuple { + get messageId(): Bytes { + return this[0].toBytes(); + } + + get sourceChainSelector(): BigInt { + return this[1].toBigInt(); + } + + get sender(): Bytes { + return this[2].toBytes(); + } + + get data(): Bytes { + return this[3].toBytes(); + } + + get tokenAmounts(): Array { + return this[4].toTupleArray(); + } +} + +export class CcipReceiveCallMessageTokenAmountsStruct extends ethereum.Tuple { + get token(): Address { + return this[0].toAddress(); + } + + get amount(): BigInt { + return this[1].toBigInt(); + } +} + export class CleanExpiredLocksCall extends ethereum.Call { get inputs(): CleanExpiredLocksCall__Inputs { return new CleanExpiredLocksCall__Inputs(this); @@ -4324,6 +4484,44 @@ export class ConfigureCollateralCallConfigStruct extends ethereum.Tuple { } } +export class TransferCrossChainCall extends ethereum.Call { + get inputs(): TransferCrossChainCall__Inputs { + return new TransferCrossChainCall__Inputs(this); + } + + get outputs(): TransferCrossChainCall__Outputs { + return new TransferCrossChainCall__Outputs(this); + } +} + +export class TransferCrossChainCall__Inputs { + _call: TransferCrossChainCall; + + constructor(call: TransferCrossChainCall) { + this._call = call; + } + + get destChainId(): BigInt { + return this._call.inputValues[0].value.toBigInt(); + } + + get amount(): BigInt { + return this._call.inputValues[1].value.toBigInt(); + } +} + +export class TransferCrossChainCall__Outputs { + _call: TransferCrossChainCall; + + constructor(call: TransferCrossChainCall) { + this._call = call; + } + + get gasTokenUsed(): BigInt { + return this._call.outputValues[0].value.toBigInt(); + } +} + export class BurnUsdCall extends ethereum.Call { get inputs(): BurnUsdCall__Inputs { return new BurnUsdCall__Inputs(this); @@ -5226,6 +5424,10 @@ export class RebalancePoolCall__Inputs { get poolId(): BigInt { return this._call.inputValues[0].value.toBigInt(); } + + get optionalCollateralType(): Address { + return this._call.inputValues[1].value.toAddress(); + } } export class RebalancePoolCall__Outputs { @@ -5622,70 +5824,66 @@ export class UpdateRewardsCall__Outputs { } } -export class ConfigureOracleManagerCall extends ethereum.Call { - get inputs(): ConfigureOracleManagerCall__Inputs { - return new ConfigureOracleManagerCall__Inputs(this); +export class ConfigureChainlinkCrossChainCall extends ethereum.Call { + get inputs(): ConfigureChainlinkCrossChainCall__Inputs { + return new ConfigureChainlinkCrossChainCall__Inputs(this); } - get outputs(): ConfigureOracleManagerCall__Outputs { - return new ConfigureOracleManagerCall__Outputs(this); + get outputs(): ConfigureChainlinkCrossChainCall__Outputs { + return new ConfigureChainlinkCrossChainCall__Outputs(this); } } -export class ConfigureOracleManagerCall__Inputs { - _call: ConfigureOracleManagerCall; +export class ConfigureChainlinkCrossChainCall__Inputs { + _call: ConfigureChainlinkCrossChainCall; - constructor(call: ConfigureOracleManagerCall) { + constructor(call: ConfigureChainlinkCrossChainCall) { this._call = call; } - get oracleManagerAddress(): Address { + get ccipRouter(): Address { return this._call.inputValues[0].value.toAddress(); } + + get ccipTokenPool(): Address { + return this._call.inputValues[1].value.toAddress(); + } } -export class ConfigureOracleManagerCall__Outputs { - _call: ConfigureOracleManagerCall; +export class ConfigureChainlinkCrossChainCall__Outputs { + _call: ConfigureChainlinkCrossChainCall; - constructor(call: ConfigureOracleManagerCall) { + constructor(call: ConfigureChainlinkCrossChainCall) { this._call = call; } } -export class RegisterCcipCall extends ethereum.Call { - get inputs(): RegisterCcipCall__Inputs { - return new RegisterCcipCall__Inputs(this); +export class ConfigureOracleManagerCall extends ethereum.Call { + get inputs(): ConfigureOracleManagerCall__Inputs { + return new ConfigureOracleManagerCall__Inputs(this); } - get outputs(): RegisterCcipCall__Outputs { - return new RegisterCcipCall__Outputs(this); + get outputs(): ConfigureOracleManagerCall__Outputs { + return new ConfigureOracleManagerCall__Outputs(this); } } -export class RegisterCcipCall__Inputs { - _call: RegisterCcipCall; +export class ConfigureOracleManagerCall__Inputs { + _call: ConfigureOracleManagerCall; - constructor(call: RegisterCcipCall) { + constructor(call: ConfigureOracleManagerCall) { this._call = call; } - get ccipSend(): Address { + get oracleManagerAddress(): Address { return this._call.inputValues[0].value.toAddress(); } - - get ccipReceive(): Address { - return this._call.inputValues[1].value.toAddress(); - } - - get ccipTokenPool(): Address { - return this._call.inputValues[2].value.toAddress(); - } } -export class RegisterCcipCall__Outputs { - _call: RegisterCcipCall; +export class ConfigureOracleManagerCall__Outputs { + _call: ConfigureOracleManagerCall; - constructor(call: RegisterCcipCall) { + constructor(call: ConfigureOracleManagerCall) { this._call = call; } } @@ -5724,6 +5922,44 @@ export class SetConfigCall__Outputs { } } +export class SetSupportedCrossChainNetworksCall extends ethereum.Call { + get inputs(): SetSupportedCrossChainNetworksCall__Inputs { + return new SetSupportedCrossChainNetworksCall__Inputs(this); + } + + get outputs(): SetSupportedCrossChainNetworksCall__Outputs { + return new SetSupportedCrossChainNetworksCall__Outputs(this); + } +} + +export class SetSupportedCrossChainNetworksCall__Inputs { + _call: SetSupportedCrossChainNetworksCall; + + constructor(call: SetSupportedCrossChainNetworksCall) { + this._call = call; + } + + get supportedNetworks(): Array { + return this._call.inputValues[0].value.toBigIntArray(); + } + + get ccipSelectors(): Array { + return this._call.inputValues[1].value.toBigIntArray(); + } +} + +export class SetSupportedCrossChainNetworksCall__Outputs { + _call: SetSupportedCrossChainNetworksCall; + + constructor(call: SetSupportedCrossChainNetworksCall) { + this._call = call; + } + + get numRegistered(): BigInt { + return this._call.outputValues[0].value.toBigInt(); + } +} + export class DelegateCollateralCall extends ethereum.Call { get inputs(): DelegateCollateralCall__Inputs { return new DelegateCollateralCall__Inputs(this); @@ -5903,7 +6139,7 @@ export class GetPositionDebtCall__Outputs { this._call = call; } - get value0(): BigInt { + get debt(): BigInt { return this._call.outputValues[0].value.toBigInt(); } } diff --git a/protocol/synthetix/subgraph/package.json b/protocol/synthetix/subgraph/package.json index 25527a1dde..60ee9d58dc 100644 --- a/protocol/synthetix/subgraph/package.json +++ b/protocol/synthetix/subgraph/package.json @@ -4,6 +4,7 @@ "private": true, "version": "1.0.0", "scripts": { + "subgraphgen": "yarn deployments:optimism-goerli && yarn codegen", "deployments": "yarn deployments:mainnet && yarn deployments:optimism-mainnet && yarn deployments:goerli && yarn deployments:optimism-goerli", "auth": "graph auth --product hosted-service $V3_GRAPH_KEY", "deployments:mainnet": "cannon inspect synthetix:latest --chain-id 1 --write-deployments ./deployments/mainnet", @@ -29,7 +30,7 @@ "devDependencies": { "@graphprotocol/graph-cli": "^0.50.1", "@graphprotocol/graph-ts": "^0.30.0", - "@usecannon/cli": "^2.4.17", + "@usecannon/cli": "^2.4.20", "ethers": "^5.7.2", "matchstick-as": "^0.5.2", "prettier": "^2.8.8" diff --git a/utils/common-config/package.json b/utils/common-config/package.json index 56b91fd196..51450f7b19 100644 --- a/utils/common-config/package.json +++ b/utils/common-config/package.json @@ -15,8 +15,8 @@ "@synthetixio/hardhat-storage": "workspace:*", "@typechain/ethers-v5": "10.1.0", "@typechain/hardhat": "6.1.3", - "@usecannon/builder": "^2.4.16", - "cannon-plugin-router": "^1.0.12", + "@usecannon/builder": "^2.4.20", + "cannon-plugin-router": "^1.0.15", "dotenv": "16.0.1", "hardhat": "2.15.0", "hardhat-cannon": "2.4.17", diff --git a/utils/docgen/package.json b/utils/docgen/package.json index 38ad251e66..5fe4ee20c0 100644 --- a/utils/docgen/package.json +++ b/utils/docgen/package.json @@ -10,7 +10,7 @@ "abis": "node ./abis.js" }, "devDependencies": { - "@usecannon/cli": "^2.4.17", + "@usecannon/cli": "^2.4.20", "handlebars": "4.7.7", "prettier": "^2.8.8", "solidity-ast": "0.4.46", diff --git a/utils/sample-project/package.json b/utils/sample-project/package.json index c00dd070a2..161b138422 100644 --- a/utils/sample-project/package.json +++ b/utils/sample-project/package.json @@ -18,8 +18,8 @@ "@synthetixio/core-utils": "workspace:*", "@synthetixio/hardhat-storage": "workspace:*", "@synthetixio/router": "^3.1.3", - "@usecannon/builder": "^2.4.16", - "cannon-plugin-router": "^1.0.12", + "@usecannon/builder": "^2.4.20", + "cannon-plugin-router": "^1.0.15", "ethers": "^5.7.2", "hardhat": "2.15.0", "hardhat-cannon": "2.4.17", diff --git a/yarn.lock b/yarn.lock index fc9160d4a3..333ec30937 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2632,8 +2632,8 @@ __metadata: "@synthetixio/hardhat-storage": "workspace:*" "@typechain/ethers-v5": 10.1.0 "@typechain/hardhat": 6.1.3 - "@usecannon/builder": ^2.4.16 - cannon-plugin-router: ^1.0.12 + "@usecannon/builder": ^2.4.20 + cannon-plugin-router: ^1.0.15 dotenv: 16.0.1 hardhat: 2.15.0 hardhat-cannon: 2.4.17 @@ -2677,7 +2677,7 @@ __metadata: dependencies: "@graphprotocol/graph-cli": ^0.50.1 "@graphprotocol/graph-ts": ^0.30.0 - "@usecannon/cli": ^2.4.17 + "@usecannon/cli": ^2.4.20 ethers: ^5.7.2 matchstick-as: ^0.5.2 prettier: ^2.8.8 @@ -2737,7 +2737,7 @@ __metadata: version: 0.0.0-use.local resolution: "@synthetixio/docgen@workspace:utils/docgen" dependencies: - "@usecannon/cli": ^2.4.17 + "@usecannon/cli": ^2.4.20 handlebars: 4.7.7 prettier: ^2.8.8 solidity-ast: 0.4.46 @@ -2803,7 +2803,7 @@ __metadata: "@synthetixio/oracle-manager": "workspace:*" "@synthetixio/router": ^3.1.3 "@synthetixio/wei": 2.74.4 - "@usecannon/builder": ^2.4.16 + "@usecannon/builder": ^2.4.20 ethers: ^5.7.2 hardhat: 2.15.0 solidity-ast: 0.4.46 @@ -2856,7 +2856,7 @@ __metadata: "@synthetixio/router": ^3.1.3 "@synthetixio/spot-market": "workspace:*" "@synthetixio/wei": 2.74.4 - "@usecannon/cli": ^2.4.17 + "@usecannon/cli": ^2.4.20 ethers: ^5.7.2 hardhat: 2.15.0 solidity-docgen: 0.6.0-beta.35 @@ -2865,9 +2865,9 @@ __metadata: languageName: unknown linkType: soft -"@synthetixio/router@npm:3.1.3, @synthetixio/router@npm:^3.1.3": - version: 3.1.3 - resolution: "@synthetixio/router@npm:3.1.3" +"@synthetixio/router@npm:^3.1.3, @synthetixio/router@npm:^3.1.4": + version: 3.1.4 + resolution: "@synthetixio/router@npm:3.1.4" dependencies: "@ethersproject/abi": ^5.7.0 ajv: ^8.11.0 @@ -2884,7 +2884,7 @@ __metadata: optional: true hardhat: optional: true - checksum: bf2d8db9f8cb49fe68a2084def37e43f57455937a9675ee302b7990067a2e3f29d2f880bb345d334f3a2e784b27151d9fade3f77f8e588d555e054f66a3a3f02 + checksum: da369169a1f25d67f395e569fbdd17dd8d776463c8f1c0b122f61617e4501da2f882590a0ee93043162d5850d9fa97ec3b619b0650c371e602bd2394c1c0224f languageName: node linkType: hard @@ -2898,8 +2898,8 @@ __metadata: "@synthetixio/core-utils": "workspace:*" "@synthetixio/hardhat-storage": "workspace:*" "@synthetixio/router": ^3.1.3 - "@usecannon/builder": ^2.4.16 - cannon-plugin-router: ^1.0.12 + "@usecannon/builder": ^2.4.20 + cannon-plugin-router: ^1.0.15 ethers: ^5.7.2 hardhat: 2.15.0 hardhat-cannon: 2.4.17 @@ -2913,7 +2913,7 @@ __metadata: dependencies: "@graphprotocol/graph-cli": ^0.50.1 "@graphprotocol/graph-ts": ^0.30.0 - "@usecannon/cli": ^2.4.17 + "@usecannon/cli": ^2.4.20 ethers: ^5.7.2 prettier: ^2.8.8 languageName: unknown @@ -2933,7 +2933,7 @@ __metadata: "@synthetixio/router": ^3.1.3 "@synthetixio/wei": 2.74.4 "@types/node-fetch": 2.6.4 - "@usecannon/cli": ^2.4.17 + "@usecannon/cli": ^2.4.20 ethers: ^5.7.2 hardhat: 2.15.0 node-fetch: 2.6.9 @@ -3545,27 +3545,9 @@ __metadata: languageName: node linkType: hard -"@usecannon/builder@npm:^2.4.16": - version: 2.4.16 - resolution: "@usecannon/builder@npm:2.4.16" - dependencies: - ajv: ^8.11.0 - axios: ^1.2.2 - buffer: ^6.0.3 - debug: ^4.3.4 - form-data: ^4.0.0 - lodash: ^4.17.21 - pako: ^2.1.0 - promise-events: ^0.2.4 - peerDependencies: - ethers: ">=5.6.0" - checksum: c9c7049a84f6b843e1a8c4a7714d03c544b28a9f8c89572e986c441ec1fdc5dc4df95ff8329b79d149b3f190b860e5f94215b1812d8ec050c51426e89e373bb4 - languageName: node - linkType: hard - -"@usecannon/builder@npm:^2.4.19": - version: 2.4.19 - resolution: "@usecannon/builder@npm:2.4.19" +"@usecannon/builder@npm:^2.4.16, @usecannon/builder@npm:^2.4.20": + version: 2.4.20 + resolution: "@usecannon/builder@npm:2.4.20" dependencies: ajv: ^8.11.0 axios: ^1.2.2 @@ -3577,43 +3559,17 @@ __metadata: promise-events: ^0.2.4 peerDependencies: ethers: ">=5.6.0" - checksum: 1ec415fa4f2c33fbfc2d1459293234d59952e66c8c043a95ae616efdcd8f61ca988f9ee19212da0252612aabadb728728be9cb4c3b676648452ef9eac6908289 - languageName: node - linkType: hard - -"@usecannon/cli@npm:^2.4.17": - version: 2.4.17 - resolution: "@usecannon/cli@npm:2.4.17" - dependencies: - "@iarna/toml": ^3.0.0 - "@synthetixio/wei": ^2.74.1 - "@usecannon/builder": ^2.4.16 - chalk: ^4.1.2 - commander: ^9.3.0 - debug: ^4.3.4 - eth-provider: ^0.13.6 - ethers: ^5.7.1 - fastq: ^1.15.0 - fs-extra: ^10.1.0 - lodash: ^4.17.21 - prompts: ^2.4.2 - semver: ^7.3.7 - table: ^6.8.0 - tildify: 2.0.0 - untildify: ^4.0.0 - bin: - cannon: dist/bin/cannon.js - checksum: c658e149e6fc527bda0ce9d032a6341a4cde5adfd318098f58bb52c4936c1c4e46568b7c18a91b1b37ccbd4840d0977776efdc39ec32abb12d1f8e8e3a656871 + checksum: 342818635e88b0b1fd74be5d96f46078fab65faef86d258267f10a2dd8920856123168f17cc91c737e9b91a91ac8d7d8dcb5c6151cd3d2ab3f3a75f46e7a45f3 languageName: node linkType: hard -"@usecannon/cli@npm:^2.4.19": - version: 2.4.19 - resolution: "@usecannon/cli@npm:2.4.19" +"@usecannon/cli@npm:^2.4.17, @usecannon/cli@npm:^2.4.20": + version: 2.4.20 + resolution: "@usecannon/cli@npm:2.4.20" dependencies: "@iarna/toml": ^3.0.0 "@synthetixio/wei": ^2.74.1 - "@usecannon/builder": ^2.4.19 + "@usecannon/builder": ^2.4.20 chalk: ^4.1.2 commander: ^9.3.0 debug: ^4.3.4 @@ -3629,7 +3585,7 @@ __metadata: untildify: ^4.0.0 bin: cannon: dist/bin/cannon.js - checksum: 78c5691c12d9d93691f382328423b6dc756253709102878992570cdfc6d9da39b82058d9298b1c20d2f3188d756811a7d95eed44a452d998250c03f2444088d3 + checksum: 39fa135e5dbdee25e05735b7e273ea1670ba6c1a4ff9edabf4ae59c3c6383a2c8fcb8bb0bd5d6d72d9285b848480a0efa544206a96913076b3412b8e288b5046 languageName: node linkType: hard @@ -4999,12 +4955,12 @@ __metadata: languageName: node linkType: hard -"cannon-plugin-router@npm:^1.0.12": - version: 1.0.12 - resolution: "cannon-plugin-router@npm:1.0.12" +"cannon-plugin-router@npm:^1.0.15": + version: 1.0.15 + resolution: "cannon-plugin-router@npm:1.0.15" dependencies: - "@synthetixio/router": 3.1.3 - checksum: 83eb3d5638df1ef471fcea5a7fbc6b91d01c81071dde8361234c38f9b9851f953fa62fbcd70499e2314dd1d88dd40ff84614bd2d8d07ed142ddf60819b4cef80 + "@synthetixio/router": ^3.1.4 + checksum: 4b4678f8b090ea6d161ceddb9dd7b02100bd4dd3d28431f485d8f2f281cc07566ff25fffdb18eb711b5b45796c0a6379c1ac5026bef1c6996074de0159c877d6 languageName: node linkType: hard @@ -15132,7 +15088,7 @@ __metadata: "@types/node": 18.11.10 "@typescript-eslint/eslint-plugin": 5.45.0 "@typescript-eslint/parser": 5.45.0 - "@usecannon/cli": ^2.4.19 + "@usecannon/cli": ^2.4.20 eslint: 8.29.0 eslint-config-prettier: 8.5.0 eslint-plugin-no-only-tests: 3.1.0