@reyaxyz/common 0.100.1 → 0.101.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/transactions/abis/Periphery.json +101 -5
- package/dist/transactions/routerCommands.js +1 -3
- package/dist/transactions/routerCommands.js.map +1 -1
- package/dist/types/transactions/routerCommands.d.ts +1 -2
- package/dist/types/transactions/routerCommands.d.ts.map +1 -1
- package/dist/utils/network.js +2 -2
- package/dist/utils/network.js.map +1 -1
- package/package.json +2 -2
- package/src/transactions/abis/Periphery.json +101 -5
- package/src/transactions/routerCommands.ts +0 -2
- package/src/utils/network.ts +2 -2
|
@@ -202,10 +202,6 @@
|
|
|
202
202
|
"name": "ZeroAddress",
|
|
203
203
|
"inputs": []
|
|
204
204
|
},
|
|
205
|
-
{
|
|
206
|
-
"type": "receive",
|
|
207
|
-
"stateMutability": "payable"
|
|
208
|
-
},
|
|
209
205
|
{
|
|
210
206
|
"type": "function",
|
|
211
207
|
"name": "getGlobalConfiguration",
|
|
@@ -322,6 +318,13 @@
|
|
|
322
318
|
],
|
|
323
319
|
"stateMutability": "view"
|
|
324
320
|
},
|
|
321
|
+
{
|
|
322
|
+
"type": "function",
|
|
323
|
+
"name": "receiveEth",
|
|
324
|
+
"inputs": [],
|
|
325
|
+
"outputs": [],
|
|
326
|
+
"stateMutability": "payable"
|
|
327
|
+
},
|
|
325
328
|
{
|
|
326
329
|
"type": "function",
|
|
327
330
|
"name": "rescueErc20",
|
|
@@ -684,6 +687,80 @@
|
|
|
684
687
|
}
|
|
685
688
|
]
|
|
686
689
|
},
|
|
690
|
+
{
|
|
691
|
+
"type": "function",
|
|
692
|
+
"name": "execute",
|
|
693
|
+
"inputs": [
|
|
694
|
+
{
|
|
695
|
+
"name": "inputs",
|
|
696
|
+
"type": "tuple",
|
|
697
|
+
"internalType": "struct PeripheryExecutionInputs",
|
|
698
|
+
"components": [
|
|
699
|
+
{
|
|
700
|
+
"name": "accountId",
|
|
701
|
+
"type": "uint128",
|
|
702
|
+
"internalType": "uint128"
|
|
703
|
+
},
|
|
704
|
+
{
|
|
705
|
+
"name": "commands",
|
|
706
|
+
"type": "tuple[]",
|
|
707
|
+
"internalType": "struct Command[]",
|
|
708
|
+
"components": [
|
|
709
|
+
{
|
|
710
|
+
"name": "commandType",
|
|
711
|
+
"type": "uint8",
|
|
712
|
+
"internalType": "enum CommandType"
|
|
713
|
+
},
|
|
714
|
+
{
|
|
715
|
+
"name": "inputs",
|
|
716
|
+
"type": "bytes",
|
|
717
|
+
"internalType": "bytes"
|
|
718
|
+
},
|
|
719
|
+
{
|
|
720
|
+
"name": "marketId",
|
|
721
|
+
"type": "uint128",
|
|
722
|
+
"internalType": "uint128"
|
|
723
|
+
},
|
|
724
|
+
{
|
|
725
|
+
"name": "exchangeId",
|
|
726
|
+
"type": "uint128",
|
|
727
|
+
"internalType": "uint128"
|
|
728
|
+
}
|
|
729
|
+
]
|
|
730
|
+
},
|
|
731
|
+
{
|
|
732
|
+
"name": "sig",
|
|
733
|
+
"type": "tuple",
|
|
734
|
+
"internalType": "struct EIP712Signature",
|
|
735
|
+
"components": [
|
|
736
|
+
{
|
|
737
|
+
"name": "v",
|
|
738
|
+
"type": "uint8",
|
|
739
|
+
"internalType": "uint8"
|
|
740
|
+
},
|
|
741
|
+
{
|
|
742
|
+
"name": "r",
|
|
743
|
+
"type": "bytes32",
|
|
744
|
+
"internalType": "bytes32"
|
|
745
|
+
},
|
|
746
|
+
{
|
|
747
|
+
"name": "s",
|
|
748
|
+
"type": "bytes32",
|
|
749
|
+
"internalType": "bytes32"
|
|
750
|
+
},
|
|
751
|
+
{
|
|
752
|
+
"name": "deadline",
|
|
753
|
+
"type": "uint256",
|
|
754
|
+
"internalType": "uint256"
|
|
755
|
+
}
|
|
756
|
+
]
|
|
757
|
+
}
|
|
758
|
+
]
|
|
759
|
+
}
|
|
760
|
+
],
|
|
761
|
+
"outputs": [],
|
|
762
|
+
"stateMutability": "nonpayable"
|
|
763
|
+
},
|
|
687
764
|
{
|
|
688
765
|
"type": "function",
|
|
689
766
|
"name": "executeMatchOrders",
|
|
@@ -758,9 +835,28 @@
|
|
|
758
835
|
"outputs": [],
|
|
759
836
|
"stateMutability": "nonpayable"
|
|
760
837
|
},
|
|
838
|
+
{
|
|
839
|
+
"type": "function",
|
|
840
|
+
"name": "isCommandAllowed",
|
|
841
|
+
"inputs": [
|
|
842
|
+
{
|
|
843
|
+
"name": "command",
|
|
844
|
+
"type": "uint8",
|
|
845
|
+
"internalType": "enum CommandType"
|
|
846
|
+
}
|
|
847
|
+
],
|
|
848
|
+
"outputs": [
|
|
849
|
+
{
|
|
850
|
+
"name": "",
|
|
851
|
+
"type": "bool",
|
|
852
|
+
"internalType": "bool"
|
|
853
|
+
}
|
|
854
|
+
],
|
|
855
|
+
"stateMutability": "pure"
|
|
856
|
+
},
|
|
761
857
|
{
|
|
762
858
|
"type": "error",
|
|
763
|
-
"name": "
|
|
859
|
+
"name": "InvalidPeripheryExecution",
|
|
764
860
|
"inputs": []
|
|
765
861
|
},
|
|
766
862
|
{
|
|
@@ -14,14 +14,12 @@ var CommandType;
|
|
|
14
14
|
CommandType[CommandType["WITHDRAW"] = 1] = "WITHDRAW";
|
|
15
15
|
CommandType[CommandType["DUTCH_LIQUIDATION"] = 2] = "DUTCH_LIQUIDATION";
|
|
16
16
|
CommandType[CommandType["MATCH_ORDER"] = 3] = "MATCH_ORDER";
|
|
17
|
-
CommandType[CommandType["
|
|
18
|
-
CommandType[CommandType["TRANSFER_MARGIN_ACCOUNT"] = 5] = "TRANSFER_MARGIN_ACCOUNT";
|
|
17
|
+
CommandType[CommandType["TRANSFER_MARGIN_ACCOUNT"] = 4] = "TRANSFER_MARGIN_ACCOUNT";
|
|
19
18
|
})(CommandType || (exports.CommandType = CommandType = {}));
|
|
20
19
|
var ABI_DEFINITION = (_a = {},
|
|
21
20
|
_a[CommandType.DEPOSIT] = ['address', 'uint256'],
|
|
22
21
|
_a[CommandType.WITHDRAW] = ['address', 'uint256'],
|
|
23
22
|
_a[CommandType.MATCH_ORDER] = ['uint128[]', 'bytes'],
|
|
24
|
-
_a[CommandType.PROPAGATE_CACHE_FLOW] = [],
|
|
25
23
|
_a[CommandType.DUTCH_LIQUIDATION] = ['tuple(uint128,address,uint128[],bytes)'],
|
|
26
24
|
_a[CommandType.TRANSFER_MARGIN_ACCOUNT] = ['tuple(uint128,address,uint256)'],
|
|
27
25
|
_a);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routerCommands.js","sourceRoot":"/","sources":["transactions/routerCommands.ts"],"names":[],"mappings":";;;;AAAA,iCAAkC;AAGlC;;;;GAIG;AACH,IAAY,
|
|
1
|
+
{"version":3,"file":"routerCommands.js","sourceRoot":"/","sources":["transactions/routerCommands.ts"],"names":[],"mappings":";;;;AAAA,iCAAkC;AAGlC;;;;GAIG;AACH,IAAY,WAMX;AAND,WAAY,WAAW;IACrB,mDAAO,CAAA;IACP,qDAAQ,CAAA;IACR,uEAAiB,CAAA;IACjB,2DAAW,CAAA;IACX,mFAAuB,CAAA;AACzB,CAAC,EANW,WAAW,2BAAX,WAAW,QAMtB;AAED,IAAM,cAAc;IAClB,GAAC,WAAW,CAAC,OAAO,IAAG,CAAC,SAAS,EAAE,SAAS,CAAC;IAC7C,GAAC,WAAW,CAAC,QAAQ,IAAG,CAAC,SAAS,EAAE,SAAS,CAAC;IAC9C,GAAC,WAAW,CAAC,WAAW,IAAG,CAAC,WAAW,EAAE,OAAO,CAAC;IACjD,GAAC,WAAW,CAAC,iBAAiB,IAAG,CAAC,wCAAwC,CAAC;IAC3E,GAAC,WAAW,CAAC,uBAAuB,IAAG,CAAC,gCAAgC,CAAC;OAC1E,CAAC;AASF,SAAgB,aAAa,CAC3B,IAAiB,EACjB,UAAqB,EACrB,QAAgB,EAChB,UAAkB;IAElB,IAAM,YAAY,GAAG,iBAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CACpD,cAAc,CAAC,IAAI,CAAC,EACpB,UAAU,CACX,CAAC;IACF,OAAO,EAAE,IAAI,MAAA,EAAE,YAAY,cAAA,EAAE,QAAQ,UAAA,EAAE,UAAU,YAAA,EAAE,CAAC;AACtD,CAAC;AAXD,sCAWC;AAED,SAAgB,UAAU,CACxB,IAAiB,EACjB,UAAqB,EACrB,QAAgB,EAChB,UAAkB;IAElB,IAAM,OAAO,GAAG,aAAa,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;IACtE,OAAO;QACL,OAAO,EAAE;YACP,WAAW,EAAE,OAAO,CAAC,IAAI;YACzB,MAAM,EAAE,OAAO,CAAC,YAAY;YAC5B,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,UAAU,EAAE,OAAO,CAAC,UAAU;SAC/B;KACF,CAAC;AACJ,CAAC;AAfD,gCAeC","sourcesContent":["import { AbiCoder } from 'ethers';\nimport { SingleAction } from './action';\n\n/**\n * CommandTypes\n * @description Flags that modify a command's execution\n * @enum {number}\n */\nexport enum CommandType {\n DEPOSIT,\n WITHDRAW,\n DUTCH_LIQUIDATION,\n MATCH_ORDER,\n TRANSFER_MARGIN_ACCOUNT,\n}\n\nconst ABI_DEFINITION: { [key in CommandType]: string[] } = {\n [CommandType.DEPOSIT]: ['address', 'uint256'],\n [CommandType.WITHDRAW]: ['address', 'uint256'],\n [CommandType.MATCH_ORDER]: ['uint128[]', 'bytes'],\n [CommandType.DUTCH_LIQUIDATION]: ['tuple(uint128,address,uint128[],bytes)'],\n [CommandType.TRANSFER_MARGIN_ACCOUNT]: ['tuple(uint128,address,uint256)'], // @todo update once needed\n};\n\nexport type RouterCommand = {\n type: CommandType;\n encodedInput: string;\n marketId: number;\n exchangeId: number;\n};\n\nexport function createCommand(\n type: CommandType,\n parameters: unknown[],\n marketId: number,\n exchangeId: number,\n): RouterCommand {\n const encodedInput = AbiCoder.defaultAbiCoder().encode(\n ABI_DEFINITION[type],\n parameters,\n );\n return { type, encodedInput, marketId, exchangeId };\n}\n\nexport function getCommand(\n type: CommandType,\n parameters: unknown[],\n marketId: number,\n exchangeId: number,\n): SingleAction {\n const command = createCommand(type, parameters, marketId, exchangeId);\n return {\n command: {\n commandType: command.type,\n inputs: command.encodedInput,\n marketId: command.marketId,\n exchangeId: command.exchangeId,\n },\n };\n}\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routerCommands.d.ts","sourceRoot":"/","sources":["transactions/routerCommands.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExC;;;;GAIG;AACH,oBAAY,WAAW;IACrB,OAAO,IAAA;IACP,QAAQ,IAAA;IACR,iBAAiB,IAAA;IACjB,WAAW,IAAA;IACX,
|
|
1
|
+
{"version":3,"file":"routerCommands.d.ts","sourceRoot":"/","sources":["transactions/routerCommands.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExC;;;;GAIG;AACH,oBAAY,WAAW;IACrB,OAAO,IAAA;IACP,QAAQ,IAAA;IACR,iBAAiB,IAAA;IACjB,WAAW,IAAA;IACX,uBAAuB,IAAA;CACxB;AAUD,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,WAAW,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,wBAAgB,aAAa,CAC3B,IAAI,EAAE,WAAW,EACjB,UAAU,EAAE,OAAO,EAAE,EACrB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,GACjB,aAAa,CAMf;AAED,wBAAgB,UAAU,CACxB,IAAI,EAAE,WAAW,EACjB,UAAU,EAAE,OAAO,EAAE,EACrB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,GACjB,YAAY,CAUd"}
|
package/dist/utils/network.js
CHANGED
|
@@ -37,7 +37,7 @@ function getReyaNetworkFromMoneyInOutChainId(moneyInOutChainId) {
|
|
|
37
37
|
if (getMoneyInOutNetworks('test').includes(moneyInOutChainId)) {
|
|
38
38
|
return getReyaNetwork('test');
|
|
39
39
|
}
|
|
40
|
-
throw new Error(
|
|
40
|
+
throw new Error("Unknown money in out network in getReyaNetworkFromMoneyInOutChainId: ".concat(moneyInOutChainId));
|
|
41
41
|
}
|
|
42
42
|
exports.getReyaNetworkFromMoneyInOutChainId = getReyaNetworkFromMoneyInOutChainId;
|
|
43
43
|
function getMoneyInOutNetworksFromReyaChainId(reyaChainId) {
|
|
@@ -47,7 +47,7 @@ function getMoneyInOutNetworksFromReyaChainId(reyaChainId) {
|
|
|
47
47
|
if (getReyaNetwork('test') === reyaChainId) {
|
|
48
48
|
return getMoneyInOutNetworks('test');
|
|
49
49
|
}
|
|
50
|
-
throw new Error(
|
|
50
|
+
throw new Error("Unknown money in out network in getMoneyInOutNetworksFromReyaChainId: ".concat(reyaChainId));
|
|
51
51
|
}
|
|
52
52
|
exports.getMoneyInOutNetworksFromReyaChainId = getMoneyInOutNetworksFromReyaChainId;
|
|
53
53
|
exports.chainIdToExplorerURL = (_a = {},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network.js","sourceRoot":"/","sources":["utils/network.ts"],"names":[],"mappings":";;;;AAAA,kCAA0D;AAE1D,SAAgB,cAAc,CAAC,GAA0B;IACvD,IAAI,GAAG,KAAK,YAAY;QAAE,OAAO,mBAAW,CAAC,WAAW,CAAC;IACzD,IAAI,GAAG,KAAK,MAAM;QAAE,OAAO,mBAAW,CAAC,UAAU,CAAC;IAElD,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;AACpD,CAAC;AALD,wCAKC;AAED,SAAgB,qBAAqB,CACnC,GAA0B;IAE1B,IAAI,GAAG,KAAK,YAAY;QACtB,OAAO;YACL,yBAAiB,CAAC,eAAe;YACjC,yBAAiB,CAAC,SAAS;YAC3B,yBAAiB,CAAC,cAAc;YAChC,yBAAiB,CAAC,WAAW;YAC7B,yBAAiB,CAAC,WAAW;SAC9B,CAAC;IAEJ,IAAI,GAAG,KAAK,MAAM;QAChB,OAAO;YACL,yBAAiB,CAAC,eAAe;YACjC,yBAAiB,CAAC,SAAS;YAC3B,yBAAiB,CAAC,eAAe;YACjC,yBAAiB,CAAC,aAAa;SAChC,CAAC;IAEJ,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;AAC3D,CAAC;AArBD,sDAqBC;AAED,SAAgB,mCAAmC,CACjD,iBAAoC;IAEpC,IAAI,qBAAqB,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACpE,OAAO,cAAc,CAAC,YAAY,CAAC,CAAC;IACtC,CAAC;IACD,IAAI,qBAAqB,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC;QAC9D,OAAO,cAAc,CAAC,MAAM,CAAC,CAAC;IAChC,CAAC;IAED,MAAM,IAAI,KAAK,CACb,
|
|
1
|
+
{"version":3,"file":"network.js","sourceRoot":"/","sources":["utils/network.ts"],"names":[],"mappings":"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","sourcesContent":["import { MoneyInOutChainId, ReyaChainId } from '../types';\n\nexport function getReyaNetwork(env: 'production' | 'test'): ReyaChainId {\n if (env === 'production') return ReyaChainId.reyaNetwork;\n if (env === 'test') return ReyaChainId.reyaCronos;\n\n throw new Error('Unknown env for getReyaNetwork');\n}\n\nexport function getMoneyInOutNetworks(\n env: 'production' | 'test',\n): MoneyInOutChainId[] {\n if (env === 'production')\n return [\n MoneyInOutChainId.ethereumMainnet,\n MoneyInOutChainId.opMainnet,\n MoneyInOutChainId.polygonMainnet,\n MoneyInOutChainId.arbitrumOne,\n MoneyInOutChainId.baseMainnet,\n ];\n\n if (env === 'test')\n return [\n MoneyInOutChainId.ethereumSepolia,\n MoneyInOutChainId.opSepolia,\n MoneyInOutChainId.arbitrumSepolia,\n MoneyInOutChainId.polygonMumbai,\n ];\n\n throw new Error('Unknown env for getMoneyInOutNetworks');\n}\n\nexport function getReyaNetworkFromMoneyInOutChainId(\n moneyInOutChainId: MoneyInOutChainId,\n): ReyaChainId {\n if (getMoneyInOutNetworks('production').includes(moneyInOutChainId)) {\n return getReyaNetwork('production');\n }\n if (getMoneyInOutNetworks('test').includes(moneyInOutChainId)) {\n return getReyaNetwork('test');\n }\n\n throw new Error(\n `Unknown money in out network in getReyaNetworkFromMoneyInOutChainId: ${moneyInOutChainId}`,\n );\n}\n\nexport function getMoneyInOutNetworksFromReyaChainId(\n reyaChainId: ReyaChainId,\n): MoneyInOutChainId[] {\n if (getReyaNetwork('production') === reyaChainId) {\n return getMoneyInOutNetworks('production');\n }\n if (getReyaNetwork('test') === reyaChainId) {\n return getMoneyInOutNetworks('test');\n }\n\n throw new Error(\n `Unknown money in out network in getMoneyInOutNetworksFromReyaChainId: ${reyaChainId}`,\n );\n}\n\nexport const chainIdToExplorerURL: {\n [key in MoneyInOutChainId | ReyaChainId]: string;\n} = {\n [MoneyInOutChainId.ethereumMainnet]: 'https://etherscan.io',\n [MoneyInOutChainId.opMainnet]: 'https://optimistic.etherscan.io',\n [MoneyInOutChainId.polygonMainnet]: 'https://polygonscan.com',\n [MoneyInOutChainId.arbitrumOne]: 'https://arbiscan.io',\n [MoneyInOutChainId.baseMainnet]: 'https://basescan.org',\n [MoneyInOutChainId.polygonMumbai]: 'https://mumbai.polygonscan.com',\n [MoneyInOutChainId.arbitrumSepolia]: 'https://sepolia.arbiscan.io',\n [MoneyInOutChainId.opSepolia]: 'https://sepolia-optimism.etherscan.io',\n [MoneyInOutChainId.ethereumSepolia]: 'https://sepolia.etherscan.io',\n [ReyaChainId.reyaNetwork]: 'https://explorer.reya.network',\n [ReyaChainId.reyaCronos]: 'https://reya-cronos.blockscout.com',\n};\n\nexport const ChainRpcUrls: { [key in MoneyInOutChainId]: string[] } = {\n [MoneyInOutChainId.ethereumMainnet]: [\n 'https://mainnet.gateway.tenderly.co',\n 'https://eth.llamarpc.com',\n 'https://eth-mainnet.g.alchemy.com/v2/Tkk3-2tTcsCLnFa4dSSUkpZsDyOH55Ar',\n 'https://eth-mainnet.g.alchemy.com/v2/Bin_D_qtJLCqvFyzt-0SxZRWTL423_tg',\n 'https://eth-mainnet.g.alchemy.com/v2/A21_W1GwGu775PCAoQbj_pJgBPzIgAzv',\n 'https://mainnet.gateway.tenderly.co/69U6LoF0URUv5CfuIU7FdL',\n ],\n [MoneyInOutChainId.opMainnet]: [\n 'https://mainnet.optimism.io',\n 'https://optimism.llamarpc.com',\n 'https://opt-mainnet.g.alchemy.com/v2/Tkk3-2tTcsCLnFa4dSSUkpZsDyOH55Ar',\n 'https://opt-mainnet.g.alchemy.com/v2/Bin_D_qtJLCqvFyzt-0SxZRWTL423_tg',\n 'https://opt-mainnet.g.alchemy.com/v2/A21_W1GwGu775PCAoQbj_pJgBPzIgAzv',\n 'https://optimism.gateway.tenderly.co/69LkAPTI3LODcBAdtz9wQC',\n ],\n [MoneyInOutChainId.polygonMainnet]: [\n 'https://polygon-rpc.com',\n 'https://gateway.tenderly.co/public/polygon',\n 'https://polygon-mainnet.g.alchemy.com/v2/Tkk3-2tTcsCLnFa4dSSUkpZsDyOH55Ar',\n 'https://polygon-mainnet.g.alchemy.com/v2/Bin_D_qtJLCqvFyzt-0SxZRWTL423_tg',\n 'https://polygon-mainnet.g.alchemy.com/v2/A21_W1GwGu775PCAoQbj_pJgBPzIgAzv',\n 'https://polygon.gateway.tenderly.co/7Qw4fTY4kf3v02LjJjWyvZ',\n ],\n [MoneyInOutChainId.arbitrumOne]: [\n 'https://arb1.arbitrum.io/rpc',\n 'https://arbitrum.llamarpc.com',\n 'https://arb-mainnet.g.alchemy.com/v2/Tkk3-2tTcsCLnFa4dSSUkpZsDyOH55Ar',\n 'https://arb-mainnet.g.alchemy.com/v2/Bin_D_qtJLCqvFyzt-0SxZRWTL423_tg',\n 'https://arb-mainnet.g.alchemy.com/v2/A21_W1GwGu775PCAoQbj_pJgBPzIgAzv',\n 'https://arbitrum.gateway.tenderly.co/1wQGK6nNPTbSc7asucAbzA',\n ],\n [MoneyInOutChainId.baseMainnet]: [\n 'https://mainnet.base.org',\n 'https://base.llamarpc.com',\n 'https://base-mainnet.g.alchemy.com/v2/Tkk3-2tTcsCLnFa4dSSUkpZsDyOH55Ar',\n 'https://base-mainnet.g.alchemy.com/v2/Bin_D_qtJLCqvFyzt-0SxZRWTL423_tg',\n 'https://base-mainnet.g.alchemy.com/v2/A21_W1GwGu775PCAoQbj_pJgBPzIgAzv',\n 'https://base.gateway.tenderly.co/2LHAD54IBvgXiVQdhE9mIF',\n ],\n // Add the rest of the mainnet URLs above\n\n [MoneyInOutChainId.polygonMumbai]: [\n 'https://polygon-mumbai.gateway.tenderly.co',\n 'https://polygon-mumbai-bor-rpc.publicnode.com',\n 'https://polygon-mumbai.gateway.tenderly.co/6U1NVClWKWhHljBJ9yk7zm',\n ],\n [MoneyInOutChainId.arbitrumSepolia]: [\n 'https://sepolia-rollup.arbitrum.io/rpc',\n 'https://endpoints.omniatech.io/v1/arbitrum/sepolia/public',\n 'https://arbitrum-sepolia.gateway.tenderly.co/4YMRN8fKu2SV1JSNsGlbMZ',\n ],\n [MoneyInOutChainId.opSepolia]: [\n 'https://sepolia.optimism.io',\n 'https://optimism-sepolia.blockpi.network/v1/rpc/public',\n 'https://optimism-sepolia.gateway.tenderly.co/2nXBEGPk57CotvTJMjIMK7',\n ],\n [MoneyInOutChainId.ethereumSepolia]: [\n 'https://sepolia.gateway.tenderly.co',\n 'https://ethereum-sepolia.blockpi.network/v1/rpc/public',\n 'https://sepolia.gateway.tenderly.co/1u2yZV1rdVLpgOeHwD1Z8M',\n ],\n // Add the rest of the testnet URLs above\n};\n\nexport const AlchemyChainRpcUrls: { [key in MoneyInOutChainId]: string } = {\n // mainnet\n [MoneyInOutChainId.ethereumMainnet]: 'https://eth-mainnet.g.alchemy.com/v2',\n [MoneyInOutChainId.opMainnet]: 'https://opt-mainnet.g.alchemy.com/v2',\n [MoneyInOutChainId.polygonMainnet]:\n 'https://polygon-mainnet.g.alchemy.com/v2',\n [MoneyInOutChainId.arbitrumOne]: 'https://arb-mainnet.g.alchemy.com/v2',\n [MoneyInOutChainId.baseMainnet]: 'https://base-mainnet.g.alchemy.com/v2',\n // testnet\n [MoneyInOutChainId.polygonMumbai]: 'https://polygon-mumbai.g.alchemy.com/v2',\n [MoneyInOutChainId.arbitrumSepolia]: 'https://arb-sepolia.g.alchemy.com/v2',\n [MoneyInOutChainId.opSepolia]: 'https://opt-sepolia.g.alchemy.com/v2',\n [MoneyInOutChainId.ethereumSepolia]: 'https://eth-sepolia.g.alchemy.com/v2',\n};\n"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@reyaxyz/common",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.101.1",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public",
|
|
6
6
|
"registry": "https://registry.npmjs.org"
|
|
@@ -42,5 +42,5 @@
|
|
|
42
42
|
"generate:coverage-badges": "npx istanbul-badges-readme --silent"
|
|
43
43
|
},
|
|
44
44
|
"packageManager": "pnpm@8.3.1",
|
|
45
|
-
"gitHead": "
|
|
45
|
+
"gitHead": "919508f4e5967052a2960afdb0eca2608767f32b"
|
|
46
46
|
}
|
|
@@ -202,10 +202,6 @@
|
|
|
202
202
|
"name": "ZeroAddress",
|
|
203
203
|
"inputs": []
|
|
204
204
|
},
|
|
205
|
-
{
|
|
206
|
-
"type": "receive",
|
|
207
|
-
"stateMutability": "payable"
|
|
208
|
-
},
|
|
209
205
|
{
|
|
210
206
|
"type": "function",
|
|
211
207
|
"name": "getGlobalConfiguration",
|
|
@@ -322,6 +318,13 @@
|
|
|
322
318
|
],
|
|
323
319
|
"stateMutability": "view"
|
|
324
320
|
},
|
|
321
|
+
{
|
|
322
|
+
"type": "function",
|
|
323
|
+
"name": "receiveEth",
|
|
324
|
+
"inputs": [],
|
|
325
|
+
"outputs": [],
|
|
326
|
+
"stateMutability": "payable"
|
|
327
|
+
},
|
|
325
328
|
{
|
|
326
329
|
"type": "function",
|
|
327
330
|
"name": "rescueErc20",
|
|
@@ -684,6 +687,80 @@
|
|
|
684
687
|
}
|
|
685
688
|
]
|
|
686
689
|
},
|
|
690
|
+
{
|
|
691
|
+
"type": "function",
|
|
692
|
+
"name": "execute",
|
|
693
|
+
"inputs": [
|
|
694
|
+
{
|
|
695
|
+
"name": "inputs",
|
|
696
|
+
"type": "tuple",
|
|
697
|
+
"internalType": "struct PeripheryExecutionInputs",
|
|
698
|
+
"components": [
|
|
699
|
+
{
|
|
700
|
+
"name": "accountId",
|
|
701
|
+
"type": "uint128",
|
|
702
|
+
"internalType": "uint128"
|
|
703
|
+
},
|
|
704
|
+
{
|
|
705
|
+
"name": "commands",
|
|
706
|
+
"type": "tuple[]",
|
|
707
|
+
"internalType": "struct Command[]",
|
|
708
|
+
"components": [
|
|
709
|
+
{
|
|
710
|
+
"name": "commandType",
|
|
711
|
+
"type": "uint8",
|
|
712
|
+
"internalType": "enum CommandType"
|
|
713
|
+
},
|
|
714
|
+
{
|
|
715
|
+
"name": "inputs",
|
|
716
|
+
"type": "bytes",
|
|
717
|
+
"internalType": "bytes"
|
|
718
|
+
},
|
|
719
|
+
{
|
|
720
|
+
"name": "marketId",
|
|
721
|
+
"type": "uint128",
|
|
722
|
+
"internalType": "uint128"
|
|
723
|
+
},
|
|
724
|
+
{
|
|
725
|
+
"name": "exchangeId",
|
|
726
|
+
"type": "uint128",
|
|
727
|
+
"internalType": "uint128"
|
|
728
|
+
}
|
|
729
|
+
]
|
|
730
|
+
},
|
|
731
|
+
{
|
|
732
|
+
"name": "sig",
|
|
733
|
+
"type": "tuple",
|
|
734
|
+
"internalType": "struct EIP712Signature",
|
|
735
|
+
"components": [
|
|
736
|
+
{
|
|
737
|
+
"name": "v",
|
|
738
|
+
"type": "uint8",
|
|
739
|
+
"internalType": "uint8"
|
|
740
|
+
},
|
|
741
|
+
{
|
|
742
|
+
"name": "r",
|
|
743
|
+
"type": "bytes32",
|
|
744
|
+
"internalType": "bytes32"
|
|
745
|
+
},
|
|
746
|
+
{
|
|
747
|
+
"name": "s",
|
|
748
|
+
"type": "bytes32",
|
|
749
|
+
"internalType": "bytes32"
|
|
750
|
+
},
|
|
751
|
+
{
|
|
752
|
+
"name": "deadline",
|
|
753
|
+
"type": "uint256",
|
|
754
|
+
"internalType": "uint256"
|
|
755
|
+
}
|
|
756
|
+
]
|
|
757
|
+
}
|
|
758
|
+
]
|
|
759
|
+
}
|
|
760
|
+
],
|
|
761
|
+
"outputs": [],
|
|
762
|
+
"stateMutability": "nonpayable"
|
|
763
|
+
},
|
|
687
764
|
{
|
|
688
765
|
"type": "function",
|
|
689
766
|
"name": "executeMatchOrders",
|
|
@@ -758,9 +835,28 @@
|
|
|
758
835
|
"outputs": [],
|
|
759
836
|
"stateMutability": "nonpayable"
|
|
760
837
|
},
|
|
838
|
+
{
|
|
839
|
+
"type": "function",
|
|
840
|
+
"name": "isCommandAllowed",
|
|
841
|
+
"inputs": [
|
|
842
|
+
{
|
|
843
|
+
"name": "command",
|
|
844
|
+
"type": "uint8",
|
|
845
|
+
"internalType": "enum CommandType"
|
|
846
|
+
}
|
|
847
|
+
],
|
|
848
|
+
"outputs": [
|
|
849
|
+
{
|
|
850
|
+
"name": "",
|
|
851
|
+
"type": "bool",
|
|
852
|
+
"internalType": "bool"
|
|
853
|
+
}
|
|
854
|
+
],
|
|
855
|
+
"stateMutability": "pure"
|
|
856
|
+
},
|
|
761
857
|
{
|
|
762
858
|
"type": "error",
|
|
763
|
-
"name": "
|
|
859
|
+
"name": "InvalidPeripheryExecution",
|
|
764
860
|
"inputs": []
|
|
765
861
|
},
|
|
766
862
|
{
|
|
@@ -11,7 +11,6 @@ export enum CommandType {
|
|
|
11
11
|
WITHDRAW,
|
|
12
12
|
DUTCH_LIQUIDATION,
|
|
13
13
|
MATCH_ORDER,
|
|
14
|
-
PROPAGATE_CACHE_FLOW,
|
|
15
14
|
TRANSFER_MARGIN_ACCOUNT,
|
|
16
15
|
}
|
|
17
16
|
|
|
@@ -19,7 +18,6 @@ const ABI_DEFINITION: { [key in CommandType]: string[] } = {
|
|
|
19
18
|
[CommandType.DEPOSIT]: ['address', 'uint256'],
|
|
20
19
|
[CommandType.WITHDRAW]: ['address', 'uint256'],
|
|
21
20
|
[CommandType.MATCH_ORDER]: ['uint128[]', 'bytes'],
|
|
22
|
-
[CommandType.PROPAGATE_CACHE_FLOW]: [], // @todo Check if correct
|
|
23
21
|
[CommandType.DUTCH_LIQUIDATION]: ['tuple(uint128,address,uint128[],bytes)'],
|
|
24
22
|
[CommandType.TRANSFER_MARGIN_ACCOUNT]: ['tuple(uint128,address,uint256)'], // @todo update once needed
|
|
25
23
|
};
|
package/src/utils/network.ts
CHANGED
|
@@ -41,7 +41,7 @@ export function getReyaNetworkFromMoneyInOutChainId(
|
|
|
41
41
|
}
|
|
42
42
|
|
|
43
43
|
throw new Error(
|
|
44
|
-
|
|
44
|
+
`Unknown money in out network in getReyaNetworkFromMoneyInOutChainId: ${moneyInOutChainId}`,
|
|
45
45
|
);
|
|
46
46
|
}
|
|
47
47
|
|
|
@@ -56,7 +56,7 @@ export function getMoneyInOutNetworksFromReyaChainId(
|
|
|
56
56
|
}
|
|
57
57
|
|
|
58
58
|
throw new Error(
|
|
59
|
-
|
|
59
|
+
`Unknown money in out network in getMoneyInOutNetworksFromReyaChainId: ${reyaChainId}`,
|
|
60
60
|
);
|
|
61
61
|
}
|
|
62
62
|
|