@instadapp/avocado-base 0.0.30 → 0.0.31

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.
Files changed (5) hide show
  1. package/abi/forwarder.json +8 -8
  2. package/contracts/Forwarder.ts +4 -4
  3. package/contracts/factories/Forwarder__factory.ts +8 -8
  4. package/package.json +1 -1
  5. package/utils/metadata.ts +11 -1
package/abi/forwarder.json CHANGED
@@ -527,7 +527,7 @@
527
527
  },
528
528
  {
529
529
  "internalType": "uint256",
530
- "name": "validUntil",
530
+ "name": "gasPrice",
531
531
  "type": "uint256"
532
532
  },
533
533
  {
@@ -537,7 +537,7 @@
537
537
  },
538
538
  {
539
539
  "internalType": "uint256",
540
- "name": "gasPrice",
540
+ "name": "validUntil",
541
541
  "type": "uint256"
542
542
  }
543
543
  ],
@@ -780,7 +780,7 @@
780
780
  },
781
781
  {
782
782
  "internalType": "uint256",
783
- "name": "validUntil",
783
+ "name": "gasPrice",
784
784
  "type": "uint256"
785
785
  },
786
786
  {
@@ -790,7 +790,7 @@
790
790
  },
791
791
  {
792
792
  "internalType": "uint256",
793
- "name": "gasPrice",
793
+ "name": "validUntil",
794
794
  "type": "uint256"
795
795
  }
796
796
  ],
@@ -1114,7 +1114,7 @@
1114
1114
  },
1115
1115
  {
1116
1116
  "internalType": "uint256",
1117
- "name": "validUntil",
1117
+ "name": "gasPrice",
1118
1118
  "type": "uint256"
1119
1119
  },
1120
1120
  {
@@ -1124,7 +1124,7 @@
1124
1124
  },
1125
1125
  {
1126
1126
  "internalType": "uint256",
1127
- "name": "gasPrice",
1127
+ "name": "validUntil",
1128
1128
  "type": "uint256"
1129
1129
  }
1130
1130
  ],
@@ -1385,7 +1385,7 @@
1385
1385
  },
1386
1386
  {
1387
1387
  "internalType": "uint256",
1388
- "name": "validUntil",
1388
+ "name": "gasPrice",
1389
1389
  "type": "uint256"
1390
1390
  },
1391
1391
  {
@@ -1395,7 +1395,7 @@
1395
1395
  },
1396
1396
  {
1397
1397
  "internalType": "uint256",
1398
- "name": "gasPrice",
1398
+ "name": "validUntil",
1399
1399
  "type": "uint256"
1400
1400
  }
1401
1401
  ],
package/contracts/Forwarder.ts CHANGED
@@ -84,9 +84,9 @@ export declare namespace AvoCoreStructs {
84
84
 
85
85
  export type CastForwardParamsStruct = {
86
86
  gas: PromiseOrValue<BigNumberish>;
87
- validUntil: PromiseOrValue<BigNumberish>;
88
- validAfter: PromiseOrValue<BigNumberish>;
89
87
  gasPrice: PromiseOrValue<BigNumberish>;
88
+ validAfter: PromiseOrValue<BigNumberish>;
89
+ validUntil: PromiseOrValue<BigNumberish>;
90
90
  };
91
91
 
92
92
  export type CastForwardParamsStructOutput = [
@@ -96,9 +96,9 @@ export declare namespace AvoCoreStructs {
96
96
  BigNumber
97
97
  ] & {
98
98
  gas: BigNumber;
99
- validUntil: BigNumber;
100
- validAfter: BigNumber;
101
99
  gasPrice: BigNumber;
100
+ validAfter: BigNumber;
101
+ validUntil: BigNumber;
102
102
  };
103
103
 
104
104
  export type SignatureParamsStruct = {
package/contracts/factories/Forwarder__factory.ts CHANGED
@@ -535,7 +535,7 @@ const _abi = [
535
535
  },
536
536
  {
537
537
  internalType: "uint256",
538
- name: "validUntil",
538
+ name: "gasPrice",
539
539
  type: "uint256",
540
540
  },
541
541
  {
@@ -545,7 +545,7 @@ const _abi = [
545
545
  },
546
546
  {
547
547
  internalType: "uint256",
548
- name: "gasPrice",
548
+ name: "validUntil",
549
549
  type: "uint256",
550
550
  },
551
551
  ],
@@ -788,7 +788,7 @@ const _abi = [
788
788
  },
789
789
  {
790
790
  internalType: "uint256",
791
- name: "validUntil",
791
+ name: "gasPrice",
792
792
  type: "uint256",
793
793
  },
794
794
  {
@@ -798,7 +798,7 @@ const _abi = [
798
798
  },
799
799
  {
800
800
  internalType: "uint256",
801
- name: "gasPrice",
801
+ name: "validUntil",
802
802
  type: "uint256",
803
803
  },
804
804
  ],
@@ -1122,7 +1122,7 @@ const _abi = [
1122
1122
  },
1123
1123
  {
1124
1124
  internalType: "uint256",
1125
- name: "validUntil",
1125
+ name: "gasPrice",
1126
1126
  type: "uint256",
1127
1127
  },
1128
1128
  {
@@ -1132,7 +1132,7 @@ const _abi = [
1132
1132
  },
1133
1133
  {
1134
1134
  internalType: "uint256",
1135
- name: "gasPrice",
1135
+ name: "validUntil",
1136
1136
  type: "uint256",
1137
1137
  },
1138
1138
  ],
@@ -1393,7 +1393,7 @@ const _abi = [
1393
1393
  },
1394
1394
  {
1395
1395
  internalType: "uint256",
1396
- name: "validUntil",
1396
+ name: "gasPrice",
1397
1397
  type: "uint256",
1398
1398
  },
1399
1399
  {
@@ -1403,7 +1403,7 @@ const _abi = [
1403
1403
  },
1404
1404
  {
1405
1405
  internalType: "uint256",
1406
- name: "gasPrice",
1406
+ name: "validUntil",
1407
1407
  type: "uint256",
1408
1408
  },
1409
1409
  ],
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@instadapp/avocado-base",
3
- "version": "0.0.30",
3
+ "version": "0.0.31",
4
4
  "type": "module",
5
5
  "main": "./nuxt.config.ts",
6
6
  "types": "global.d.ts",
package/utils/metadata.ts CHANGED
@@ -267,7 +267,7 @@ export const decodeMetadata = (data: string) => {
267
267
  } else {
268
268
  metadata = executeDataV2.params_.metadata;
269
269
  }
270
- } else {
270
+ } else if (data.startsWith("0x85114d53")) {
271
271
  const executeDataV3 = iface.decodeFunctionData("executeV3", data);
272
272
  if (
273
273
  executeDataV3.params_.metadata === "0x" ||
@@ -277,6 +277,16 @@ export const decodeMetadata = (data: string) => {
277
277
  } else {
278
278
  metadata = executeDataV3.params_.metadata;
279
279
  }
280
+ } else {
281
+ const executeDataMultisigV3 = iface.decodeFunctionData("executeMultisigV3", data);
282
+ if (
283
+ executeDataMultisigV3.params_.metadata === "0x" ||
284
+ !executeDataMultisigV3.params_.metadata
285
+ ) {
286
+ return null;
287
+ } else {
288
+ metadata = executeDataMultisigV3.params_.metadata;
289
+ }
280
290
  }
281
291
 
282
292
  const metadataArr = [];