@defisaver/sdk 1.3.6-dev.0 → 1.3.6-dev.3

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.
@@ -293,6 +293,7 @@ export declare const actionAddresses: {
293
293
  ApproveToken: string;
294
294
  SendTokenAndUnwrap: string;
295
295
  ToggleSub: string;
296
+ UpdateSub: string;
296
297
  CreateSub: string;
297
298
  TokenBalance: string;
298
299
  TokenizedVaultAdapter: string;
@@ -332,7 +333,6 @@ export declare const actionAddresses: {
332
333
  CompV3Withdraw: string;
333
334
  SFApproveTokens: string;
334
335
  AutomationV2Unsub?: undefined;
335
- UpdateSub?: undefined;
336
336
  TransferNFT?: undefined;
337
337
  SDaiWrap?: undefined;
338
338
  SDaiUnwrap?: undefined;
@@ -1487,6 +1487,27 @@ export declare const otherAddresses: {
1487
1487
  GHO?: undefined;
1488
1488
  LUSD?: undefined;
1489
1489
  BLUSD?: undefined;
1490
+ } | {
1491
+ RecipeExecutor: string;
1492
+ DFSRegistry: string;
1493
+ AdminVault: string;
1494
+ DefisaverLogger: string;
1495
+ Empty: string;
1496
+ DFSProxyRegistry?: undefined;
1497
+ ProxyRegistry?: undefined;
1498
+ McdCdpManager?: undefined;
1499
+ BCdpManager?: undefined;
1500
+ AaveDefaultMarket?: undefined;
1501
+ UniswapV3PositionManager?: undefined;
1502
+ RaiWethUniV2LPToken?: undefined;
1503
+ BalancerToken?: undefined;
1504
+ CrvToken?: undefined;
1505
+ CvxToken?: undefined;
1506
+ DAI?: undefined;
1507
+ GHO?: undefined;
1508
+ LUSD?: undefined;
1509
+ BLUSD?: undefined;
1510
+ DSGuardFactory?: undefined;
1490
1511
  };
1491
1512
  };
1492
1513
  /**
@@ -331,6 +331,7 @@ export const actionAddresses = {
331
331
  ApproveToken: '0x842a81d2cfe26d401CD63Cc14e9DEf275c197C1a',
332
332
  SendTokenAndUnwrap: '0xd4f69250cb4d1f083Dd372FEace391A16ABbfBDc',
333
333
  ToggleSub: '0xfc19a12e35bb0b5e6a3d3017be9e9022a6486eee',
334
+ UpdateSub: '0xAe6ea1d13dF2bE60dC7933DB56067Cb89d6A2cDe',
334
335
  CreateSub: '0x2daED8030BFC87B3d27c02E2f044B9CF4841Ff3e',
335
336
  TokenBalance: '0xC6FF5b01f7c7b35b6e093fF70D2332B361C5Be5A',
336
337
  TokenizedVaultAdapter: '0xdf31669FEd440f5BfF658ca0bBF0D22B8abdeb73',
@@ -565,6 +566,40 @@ export const actionAddresses = {
565
566
  AaveV3DelegateWithSig: '0x169D6E128238ebabF86032Ae9da65938eaD7F69e',
566
567
  AaveV3DelegateCredit: '0x2A588cBCBd5e6c6ba7ED0E260B8107F599017DDE',
567
568
  },
569
+ [NETWORKS.plasma.chainId]: {
570
+ // Basic
571
+ DFSSell: '0xAC17f651591f417934EeA04CF6629584Eb50A4bB',
572
+ DFSSellNoFee: '0x0000000000000000000000000000000000000000',
573
+ WrapEth: '0x520E8b0573a03D26D0E39a409E85E28459e24C0E',
574
+ UnwrapEth: '0x93A6E0dC4C4a6033922d386e4cbd9e31278A2BBa',
575
+ SendToken: '0xa2ABA81e65543d18dd1a1E4A31Bc41C4a86453cf',
576
+ SendTokens: '0xae56474aBe3C271579b513b6668864e39f65Ae15',
577
+ SendTokenAndUnwrap: '0x7dFF34190d0307fC234fc7E8C152C9715083eB02',
578
+ PullToken: '0x169D6E128238ebabF86032Ae9da65938eaD7F69e',
579
+ ApproveToken: '0xa898078f369A78CE6b8023715e8f6d2Ad7d2719f',
580
+ SumInputs: '0x13976feAeC930Cc51986605D6f479d97a3b90FA9',
581
+ SubInputs: '0x4E1946059Dc2426Ef3a9AE82fB30B7718a09B7E1',
582
+ TokenBalance: '0xCc0f04e8c34B670a1D06f4978C843952F690d3f4',
583
+ PermitToken: '0x2A588cBCBd5e6c6ba7ED0E260B8107F599017DDE',
584
+ MerklClaim: '0xA5b3aA3f06C2c0986E1f45ae36CD6C20392798f1',
585
+ TransferNFT: '0x6d1722AE426FF9f509726bdA037d5203d83e7818',
586
+ TokenizedVaultAdapter: '0x75198244Ad7b3ebFCbFd67e6e06B1452bd6Fa831',
587
+ // Flashloan
588
+ FLAction: '0xa67f6A6Af60dD626ce7bF3d4705ABe5D593D90Ec',
589
+ FLAaveV3: '0xa67f6A6Af60dD626ce7bF3d4705ABe5D593D90Ec',
590
+ // AaveV3
591
+ AaveV3Withdraw: '0x4839d021A24820e57C31D386d430e2e82694F73B',
592
+ AaveV3Supply: '0x9D95de57631DD8Ac071892843DA67FEe52EA3962',
593
+ AaveV3SetEMode: '0xEDFc68e2874B0AFc0963e18AE4D68522aEc7f97D',
594
+ AaveV3Payback: '0xCd84Bff225760B6b8BAcF1e90e8409C25769EF52',
595
+ AaveV3CollateralSwitch: '0xdDFFd19564F9703800Da8a2FB9c2b4a7242bf01F',
596
+ AaveV3ClaimRewards: '0x50bCFC115283dF48Ab6382551B9B93b08E197747',
597
+ AaveV3Borrow: '0x2D8BFD9FF88E3106ce7214621b0770c1578749A1',
598
+ AaveV3ATokenPayback: '0x425fA97285965E01Cc5F951B62A51F6CDEA5cc0d',
599
+ AaveV3View: '0xD8E67968d8a0df4beCf2D50daE1e34d4d80C701C',
600
+ AaveV3DelegateWithSig: '0x49658E0CF3883c338397C7257619B280dF581057',
601
+ AaveV3DelegateCredit: '0x0a9b2080C14DaF008AE87C977dFDf5f5D6D0937F',
602
+ },
568
603
  };
569
604
  export const otherAddresses = {
570
605
  [NETWORKS.ethereum.chainId]: {
@@ -623,6 +658,13 @@ export const otherAddresses = {
623
658
  DefisaverLogger: '0x44e98bb58d725f2ef93a195f518b335dcb784c78',
624
659
  Empty: '0x0000000000000000000000000000000000000000',
625
660
  },
661
+ [NETWORKS.plasma.chainId]: {
662
+ RecipeExecutor: '0xB8af168883D049FF9C811ab5B5DE179f3e7d6Fb7',
663
+ DFSRegistry: '0x44e98bB58d725F2eF93a195F518b335dCB784c78',
664
+ AdminVault: '0x6AB90ff536f0E2a880DbCdef1bB665C2acC0eDdC',
665
+ DefisaverLogger: '0x02a516861f41262F22617511d00B6FCcAb65f762',
666
+ Empty: '0x0000000000000000000000000000000000000000',
667
+ },
626
668
  };
627
669
  /**
628
670
  *
package/esm/src/config.js CHANGED
@@ -51,6 +51,14 @@ export const NETWORKS = {
51
51
  rpcUrls: [],
52
52
  nativeCurrency: { name: 'Ethereum', decimals: 18, symbol: 'ETH' },
53
53
  },
54
+ plasma: {
55
+ chainId: 9745,
56
+ chainName: 'Plasma',
57
+ blockExplorerUrls: ['https://plasmascan.to/'],
58
+ iconUrls: ['https://bridge.base.org/icons/base.svg'],
59
+ rpcUrls: [],
60
+ nativeCurrency: { name: 'XPL', decimals: 18, symbol: 'XPL' },
61
+ },
54
62
  };
55
63
  /**
56
64
  *
@@ -304,6 +304,7 @@ declare const actionAddressesAllChains: {
304
304
  ApproveToken: string;
305
305
  SendTokenAndUnwrap: string;
306
306
  ToggleSub: string;
307
+ UpdateSub: string;
307
308
  CreateSub: string;
308
309
  TokenBalance: string;
309
310
  TokenizedVaultAdapter: string;
@@ -343,7 +344,6 @@ declare const actionAddressesAllChains: {
343
344
  CompV3Withdraw: string;
344
345
  SFApproveTokens: string;
345
346
  AutomationV2Unsub?: undefined;
346
- UpdateSub?: undefined;
347
347
  TransferNFT?: undefined;
348
348
  SDaiWrap?: undefined;
349
349
  SDaiUnwrap?: undefined;
@@ -1706,6 +1706,7 @@ declare const actionAddresses: (chainId?: null) => {
1706
1706
  ApproveToken: string;
1707
1707
  SendTokenAndUnwrap: string;
1708
1708
  ToggleSub: string;
1709
+ UpdateSub: string;
1709
1710
  CreateSub: string;
1710
1711
  TokenBalance: string;
1711
1712
  TokenizedVaultAdapter: string;
@@ -1745,7 +1746,6 @@ declare const actionAddresses: (chainId?: null) => {
1745
1746
  CompV3Withdraw: string;
1746
1747
  SFApproveTokens: string;
1747
1748
  AutomationV2Unsub?: undefined;
1748
- UpdateSub?: undefined;
1749
1749
  TransferNFT?: undefined;
1750
1750
  SDaiWrap?: undefined;
1751
1751
  SDaiUnwrap?: undefined;
@@ -2899,6 +2899,27 @@ declare const otherAddressesAllChains: {
2899
2899
  GHO?: undefined;
2900
2900
  LUSD?: undefined;
2901
2901
  BLUSD?: undefined;
2902
+ } | {
2903
+ RecipeExecutor: string;
2904
+ DFSRegistry: string;
2905
+ AdminVault: string;
2906
+ DefisaverLogger: string;
2907
+ Empty: string;
2908
+ DFSProxyRegistry?: undefined;
2909
+ ProxyRegistry?: undefined;
2910
+ McdCdpManager?: undefined;
2911
+ BCdpManager?: undefined;
2912
+ AaveDefaultMarket?: undefined;
2913
+ UniswapV3PositionManager?: undefined;
2914
+ RaiWethUniV2LPToken?: undefined;
2915
+ BalancerToken?: undefined;
2916
+ CrvToken?: undefined;
2917
+ CvxToken?: undefined;
2918
+ DAI?: undefined;
2919
+ GHO?: undefined;
2920
+ LUSD?: undefined;
2921
+ BLUSD?: undefined;
2922
+ DSGuardFactory?: undefined;
2902
2923
  };
2903
2924
  };
2904
2925
  declare const otherAddresses: (chainId?: null) => {
@@ -2985,6 +3006,27 @@ declare const otherAddresses: (chainId?: null) => {
2985
3006
  GHO?: undefined;
2986
3007
  LUSD?: undefined;
2987
3008
  BLUSD?: undefined;
3009
+ } | {
3010
+ RecipeExecutor: string;
3011
+ DFSRegistry: string;
3012
+ AdminVault: string;
3013
+ DefisaverLogger: string;
3014
+ Empty: string;
3015
+ DFSProxyRegistry?: undefined;
3016
+ ProxyRegistry?: undefined;
3017
+ McdCdpManager?: undefined;
3018
+ BCdpManager?: undefined;
3019
+ AaveDefaultMarket?: undefined;
3020
+ UniswapV3PositionManager?: undefined;
3021
+ RaiWethUniV2LPToken?: undefined;
3022
+ BalancerToken?: undefined;
3023
+ CrvToken?: undefined;
3024
+ CvxToken?: undefined;
3025
+ DAI?: undefined;
3026
+ GHO?: undefined;
3027
+ LUSD?: undefined;
3028
+ BLUSD?: undefined;
3029
+ DSGuardFactory?: undefined;
2988
3030
  };
2989
3031
  export { Action, ActionWithL2, Recipe, Strategy, DfsWeb3, actions, triggers, utils, configure, getNetworkData, CONFIG, networks, actionAddresses, actionAddressesAllChains, otherAddresses, otherAddressesAllChains, getAddr, };
2990
3032
  declare const _default: {
@@ -3293,6 +3335,7 @@ declare const _default: {
3293
3335
  ApproveToken: string;
3294
3336
  SendTokenAndUnwrap: string;
3295
3337
  ToggleSub: string;
3338
+ UpdateSub: string;
3296
3339
  CreateSub: string;
3297
3340
  TokenBalance: string;
3298
3341
  TokenizedVaultAdapter: string;
@@ -3332,7 +3375,6 @@ declare const _default: {
3332
3375
  CompV3Withdraw: string;
3333
3376
  SFApproveTokens: string;
3334
3377
  AutomationV2Unsub?: undefined;
3335
- UpdateSub?: undefined;
3336
3378
  TransferNFT?: undefined;
3337
3379
  SDaiWrap?: undefined;
3338
3380
  SDaiUnwrap?: undefined;
@@ -4695,6 +4737,7 @@ declare const _default: {
4695
4737
  ApproveToken: string;
4696
4738
  SendTokenAndUnwrap: string;
4697
4739
  ToggleSub: string;
4740
+ UpdateSub: string;
4698
4741
  CreateSub: string;
4699
4742
  TokenBalance: string;
4700
4743
  TokenizedVaultAdapter: string;
@@ -4734,7 +4777,6 @@ declare const _default: {
4734
4777
  CompV3Withdraw: string;
4735
4778
  SFApproveTokens: string;
4736
4779
  AutomationV2Unsub?: undefined;
4737
- UpdateSub?: undefined;
4738
4780
  TransferNFT?: undefined;
4739
4781
  SDaiWrap?: undefined;
4740
4782
  SDaiUnwrap?: undefined;
@@ -5888,6 +5930,27 @@ declare const _default: {
5888
5930
  GHO?: undefined;
5889
5931
  LUSD?: undefined;
5890
5932
  BLUSD?: undefined;
5933
+ } | {
5934
+ RecipeExecutor: string;
5935
+ DFSRegistry: string;
5936
+ AdminVault: string;
5937
+ DefisaverLogger: string;
5938
+ Empty: string;
5939
+ DFSProxyRegistry?: undefined;
5940
+ ProxyRegistry?: undefined;
5941
+ McdCdpManager?: undefined;
5942
+ BCdpManager?: undefined;
5943
+ AaveDefaultMarket?: undefined;
5944
+ UniswapV3PositionManager?: undefined;
5945
+ RaiWethUniV2LPToken?: undefined;
5946
+ BalancerToken?: undefined;
5947
+ CrvToken?: undefined;
5948
+ CvxToken?: undefined;
5949
+ DAI?: undefined;
5950
+ GHO?: undefined;
5951
+ LUSD?: undefined;
5952
+ BLUSD?: undefined;
5953
+ DSGuardFactory?: undefined;
5891
5954
  };
5892
5955
  otherAddressesAllChains: {
5893
5956
  [x: number]: {
@@ -5974,6 +6037,27 @@ declare const _default: {
5974
6037
  GHO?: undefined;
5975
6038
  LUSD?: undefined;
5976
6039
  BLUSD?: undefined;
6040
+ } | {
6041
+ RecipeExecutor: string;
6042
+ DFSRegistry: string;
6043
+ AdminVault: string;
6044
+ DefisaverLogger: string;
6045
+ Empty: string;
6046
+ DFSProxyRegistry?: undefined;
6047
+ ProxyRegistry?: undefined;
6048
+ McdCdpManager?: undefined;
6049
+ BCdpManager?: undefined;
6050
+ AaveDefaultMarket?: undefined;
6051
+ UniswapV3PositionManager?: undefined;
6052
+ RaiWethUniV2LPToken?: undefined;
6053
+ BalancerToken?: undefined;
6054
+ CrvToken?: undefined;
6055
+ CvxToken?: undefined;
6056
+ DAI?: undefined;
6057
+ GHO?: undefined;
6058
+ LUSD?: undefined;
6059
+ BLUSD?: undefined;
6060
+ DSGuardFactory?: undefined;
5977
6061
  };
5978
6062
  };
5979
6063
  getAddr: (name: string, chainId?: number) => string;
@@ -29,6 +29,7 @@ declare type Networks = {
29
29
  arbitrum: Network;
30
30
  base: Network;
31
31
  linea: Network;
32
+ plasma: Network;
32
33
  };
33
34
  declare type TxSaverData = {
34
35
  maxTxCostInFeeToken: string;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@defisaver/sdk",
3
- "version": "1.3.6-dev.0",
3
+ "version": "1.3.6-dev.3",
4
4
  "description": "",
5
5
  "main": "./umd/index.js",
6
6
  "module": "./esm/src/index.js",
package/src/addresses.ts CHANGED
@@ -379,6 +379,7 @@ export const actionAddresses = {
379
379
  ApproveToken: '0x842a81d2cfe26d401CD63Cc14e9DEf275c197C1a',
380
380
  SendTokenAndUnwrap: '0xd4f69250cb4d1f083Dd372FEace391A16ABbfBDc',
381
381
  ToggleSub: '0xfc19a12e35bb0b5e6a3d3017be9e9022a6486eee',
382
+ UpdateSub: '0xAe6ea1d13dF2bE60dC7933DB56067Cb89d6A2cDe',
382
383
  CreateSub: '0x2daED8030BFC87B3d27c02E2f044B9CF4841Ff3e',
383
384
  TokenBalance: '0xC6FF5b01f7c7b35b6e093fF70D2332B361C5Be5A',
384
385
  TokenizedVaultAdapter: '0xdf31669FEd440f5BfF658ca0bBF0D22B8abdeb73',
package/umd/index.js CHANGED
@@ -353,6 +353,18 @@ var NETWORKS = {
353
353
  decimals: 18,
354
354
  symbol: 'ETH'
355
355
  }
356
+ },
357
+ plasma: {
358
+ chainId: 9745,
359
+ chainName: 'Plasma',
360
+ blockExplorerUrls: ['https://plasmascan.to/'],
361
+ iconUrls: ['https://bridge.base.org/icons/base.svg'],
362
+ rpcUrls: [],
363
+ nativeCurrency: {
364
+ name: 'XPL',
365
+ decimals: 18,
366
+ symbol: 'XPL'
367
+ }
356
368
  }
357
369
  };
358
370
 
@@ -1632,6 +1644,7 @@ var actionAddresses = {
1632
1644
  ApproveToken: '0x842a81d2cfe26d401CD63Cc14e9DEf275c197C1a',
1633
1645
  SendTokenAndUnwrap: '0xd4f69250cb4d1f083Dd372FEace391A16ABbfBDc',
1634
1646
  ToggleSub: '0xfc19a12e35bb0b5e6a3d3017be9e9022a6486eee',
1647
+ UpdateSub: '0xAe6ea1d13dF2bE60dC7933DB56067Cb89d6A2cDe',
1635
1648
  CreateSub: '0x2daED8030BFC87B3d27c02E2f044B9CF4841Ff3e',
1636
1649
  TokenBalance: '0xC6FF5b01f7c7b35b6e093fF70D2332B361C5Be5A',
1637
1650
  TokenizedVaultAdapter: '0xdf31669FEd440f5BfF658ca0bBF0D22B8abdeb73',
@@ -1868,6 +1881,41 @@ var actionAddresses = {
1868
1881
  AaveV3View: '0xc9d6efa6e08b66a5cdc516bcd5807c2fa69e0f2a',
1869
1882
  AaveV3DelegateWithSig: '0x169D6E128238ebabF86032Ae9da65938eaD7F69e',
1870
1883
  AaveV3DelegateCredit: '0x2A588cBCBd5e6c6ba7ED0E260B8107F599017DDE'
1884
+ },
1885
+ [_config__WEBPACK_IMPORTED_MODULE_0__.NETWORKS.plasma.chainId]: {
1886
+ // Basic
1887
+ DFSSell: '0xAC17f651591f417934EeA04CF6629584Eb50A4bB',
1888
+ DFSSellNoFee: '0x0000000000000000000000000000000000000000',
1889
+ WrapEth: '0x520E8b0573a03D26D0E39a409E85E28459e24C0E',
1890
+ UnwrapEth: '0x93A6E0dC4C4a6033922d386e4cbd9e31278A2BBa',
1891
+ SendToken: '0xa2ABA81e65543d18dd1a1E4A31Bc41C4a86453cf',
1892
+ SendTokens: '0xae56474aBe3C271579b513b6668864e39f65Ae15',
1893
+ SendTokenAndUnwrap: '0x7dFF34190d0307fC234fc7E8C152C9715083eB02',
1894
+ PullToken: '0x169D6E128238ebabF86032Ae9da65938eaD7F69e',
1895
+ ApproveToken: '0xa898078f369A78CE6b8023715e8f6d2Ad7d2719f',
1896
+ SumInputs: '0x13976feAeC930Cc51986605D6f479d97a3b90FA9',
1897
+ SubInputs: '0x4E1946059Dc2426Ef3a9AE82fB30B7718a09B7E1',
1898
+ TokenBalance: '0xCc0f04e8c34B670a1D06f4978C843952F690d3f4',
1899
+ PermitToken: '0x2A588cBCBd5e6c6ba7ED0E260B8107F599017DDE',
1900
+ MerklClaim: '0xA5b3aA3f06C2c0986E1f45ae36CD6C20392798f1',
1901
+ TransferNFT: '0x6d1722AE426FF9f509726bdA037d5203d83e7818',
1902
+ TokenizedVaultAdapter: '0x75198244Ad7b3ebFCbFd67e6e06B1452bd6Fa831',
1903
+ // Flashloan
1904
+ FLAction: '0xa67f6A6Af60dD626ce7bF3d4705ABe5D593D90Ec',
1905
+ // fix temp
1906
+ FLAaveV3: '0xa67f6A6Af60dD626ce7bF3d4705ABe5D593D90Ec',
1907
+ // AaveV3
1908
+ AaveV3Withdraw: '0x4839d021A24820e57C31D386d430e2e82694F73B',
1909
+ AaveV3Supply: '0x9D95de57631DD8Ac071892843DA67FEe52EA3962',
1910
+ AaveV3SetEMode: '0xEDFc68e2874B0AFc0963e18AE4D68522aEc7f97D',
1911
+ AaveV3Payback: '0xCd84Bff225760B6b8BAcF1e90e8409C25769EF52',
1912
+ AaveV3CollateralSwitch: '0xdDFFd19564F9703800Da8a2FB9c2b4a7242bf01F',
1913
+ AaveV3ClaimRewards: '0x50bCFC115283dF48Ab6382551B9B93b08E197747',
1914
+ AaveV3Borrow: '0x2D8BFD9FF88E3106ce7214621b0770c1578749A1',
1915
+ AaveV3ATokenPayback: '0x425fA97285965E01Cc5F951B62A51F6CDEA5cc0d',
1916
+ AaveV3View: '0xD8E67968d8a0df4beCf2D50daE1e34d4d80C701C',
1917
+ AaveV3DelegateWithSig: '0x49658E0CF3883c338397C7257619B280dF581057',
1918
+ AaveV3DelegateCredit: '0x0a9b2080C14DaF008AE87C977dFDf5f5D6D0937F'
1871
1919
  }
1872
1920
  };
1873
1921
  var otherAddresses = {
@@ -1926,6 +1974,13 @@ var otherAddresses = {
1926
1974
  AdminVault: '0x71a9ef13c960c2f1dd17962d3592a5bcdfad6de0',
1927
1975
  DefisaverLogger: '0x44e98bb58d725f2ef93a195f518b335dcb784c78',
1928
1976
  Empty: '0x0000000000000000000000000000000000000000'
1977
+ },
1978
+ [_config__WEBPACK_IMPORTED_MODULE_0__.NETWORKS.plasma.chainId]: {
1979
+ RecipeExecutor: '0xB8af168883D049FF9C811ab5B5DE179f3e7d6Fb7',
1980
+ DFSRegistry: '0x44e98bB58d725F2eF93a195F518b335dCB784c78',
1981
+ AdminVault: '0x6AB90ff536f0E2a880DbCdef1bB665C2acC0eDdC',
1982
+ DefisaverLogger: '0x02a516861f41262F22617511d00B6FCcAb65f762',
1983
+ Empty: '0x0000000000000000000000000000000000000000'
1929
1984
  }
1930
1985
  };
1931
1986