@connext/apps - npm Package Compare versions

Comparing version 7.0.0-alpha.2 to 7.0.0-alpha.3-experimental

dist/index-iife.js

@@ -281,4 +281,3 @@ this.window = this.window || {};
 
-  const { Interface } = ethers.utils;
-  const iface = new Interface(contracts.ConditionalTransactionDelegateTarget.abi);
+  const { defaultAbiCoder, Interface } = ethers.utils;
   class WithdrawCommitment extends contracts.MultisigCommitment {
@@ -296,10 +295,12 @@ constructor(contractAddresses, multisigAddress, multisigOwners, recipient, assetId, amount, nonce) {
       getTransactionDetails() {
+          const encodedOutcome = defaultAbiCoder.encode([types.singleAssetSinglePartyCoinTransferEncoding], [[{ to: this.recipient, amount: this.amount }]]);
+          const encodedParams = defaultAbiCoder.encode([types.singleAssetTwoPartyCoinTransferInterpreterParamsEncoding], [{ limit: this.amount, tokenAddress: this.assetId }]);
           return {
               to: this.contractAddresses.ConditionalTransactionDelegateTarget,
               value: 0,
-              data: iface.encodeFunctionData("withdrawWrapper", [
-                  this.recipient,
-                  this.assetId,
-                  this.amount,
+              data: new Interface(contracts.ConditionalTransactionDelegateTarget.abi).encodeFunctionData("executeWithdraw", [
+                  this.contractAddresses.WithdrawInterpreter,
                   this.nonce,
+                  encodedOutcome,
+                  encodedParams,
               ]),
@@ -306,0 +307,0 @@ operation: types.MultisigOperation.DelegateCall,

dist/index.esm.js

 import { constants, Contract, utils, BigNumber } from 'ethers';
-import { DepositAppName, OutcomeType, DepositAppStateEncoding, CONVENTION_FOR_ETH_ASSET_ID, Contract as Contract$1, ProtocolRoles, HashLockTransferAppName, HashLockTransferAppActionEncoding, HashLockTransferAppStateEncoding, SimpleLinkedTransferAppActionEncoding, SimpleLinkedTransferAppName, SimpleLinkedTransferAppStateEncoding, SimpleSignedTransferAppName, SimpleSignedTransferAppStateEncoding, SimpleSignedTransferAppActionEncoding, WithdrawAppName, WithdrawAppStateEncoding, WithdrawAppActionEncoding, MultisigOperation, SimpleTwoPartySwapAppName, SimpleSwapAppStateEncoding, ProtocolNames } from '@connext/types';
+import { DepositAppName, OutcomeType, DepositAppStateEncoding, CONVENTION_FOR_ETH_ASSET_ID, Contract as Contract$1, ProtocolRoles, HashLockTransferAppName, HashLockTransferAppActionEncoding, HashLockTransferAppStateEncoding, SimpleLinkedTransferAppActionEncoding, SimpleLinkedTransferAppName, SimpleLinkedTransferAppStateEncoding, SimpleSignedTransferAppName, SimpleSignedTransferAppStateEncoding, SimpleSignedTransferAppActionEncoding, WithdrawAppName, WithdrawAppStateEncoding, WithdrawAppActionEncoding, singleAssetSinglePartyCoinTransferEncoding, singleAssetTwoPartyCoinTransferInterpreterParamsEncoding, MultisigOperation, SimpleTwoPartySwapAppName, SimpleSwapAppStateEncoding, ProtocolNames } from '@connext/types';
 import { toBN, getAddressFromAssetId, stringify, getSignerAddressFromPublicIdentifier, bigNumberifyJson, recoverAddressFromChannelMessage, calculateExchange } from '@connext/utils';
-import { ERC20, MinimumViableMultisig, ConditionalTransactionDelegateTarget, MultisigCommitment } from '@connext/contracts';
+import { ERC20, MinimumViableMultisig, MultisigCommitment, ConditionalTransactionDelegateTarget } from '@connext/contracts';
 
@@ -282,4 +282,3 @@ const DEFAULT_APP_TIMEOUT = toBN(8640);
 
-const { Interface } = utils;
-const iface = new Interface(ConditionalTransactionDelegateTarget.abi);
+const { defaultAbiCoder, Interface } = utils;
 class WithdrawCommitment extends MultisigCommitment {
@@ -297,10 +296,12 @@ constructor(contractAddresses, multisigAddress, multisigOwners, recipient, assetId, amount, nonce) {
     getTransactionDetails() {
+        const encodedOutcome = defaultAbiCoder.encode([singleAssetSinglePartyCoinTransferEncoding], [[{ to: this.recipient, amount: this.amount }]]);
+        const encodedParams = defaultAbiCoder.encode([singleAssetTwoPartyCoinTransferInterpreterParamsEncoding], [{ limit: this.amount, tokenAddress: this.assetId }]);
         return {
             to: this.contractAddresses.ConditionalTransactionDelegateTarget,
             value: 0,
-            data: iface.encodeFunctionData("withdrawWrapper", [
-                this.recipient,
-                this.assetId,
-                this.amount,
+            data: new Interface(ConditionalTransactionDelegateTarget.abi).encodeFunctionData("executeWithdraw", [
+                this.contractAddresses.WithdrawInterpreter,
                 this.nonce,
+                encodedOutcome,
+                encodedParams,
             ]),
@@ -307,0 +308,0 @@ operation: MultisigOperation.DelegateCall,

dist/index.js

@@ -286,4 +286,3 @@ 'use strict';
 
-const { Interface } = ethers.utils;
-const iface = new Interface(contracts.ConditionalTransactionDelegateTarget.abi);
+const { defaultAbiCoder, Interface } = ethers.utils;
 class WithdrawCommitment extends contracts.MultisigCommitment {
@@ -301,10 +300,12 @@ constructor(contractAddresses, multisigAddress, multisigOwners, recipient, assetId, amount, nonce) {
     getTransactionDetails() {
+        const encodedOutcome = defaultAbiCoder.encode([types.singleAssetSinglePartyCoinTransferEncoding], [[{ to: this.recipient, amount: this.amount }]]);
+        const encodedParams = defaultAbiCoder.encode([types.singleAssetTwoPartyCoinTransferInterpreterParamsEncoding], [{ limit: this.amount, tokenAddress: this.assetId }]);
         return {
             to: this.contractAddresses.ConditionalTransactionDelegateTarget,
             value: 0,
-            data: iface.encodeFunctionData("withdrawWrapper", [
-                this.recipient,
-                this.assetId,
-                this.amount,
+            data: new Interface(contracts.ConditionalTransactionDelegateTarget.abi).encodeFunctionData("executeWithdraw", [
+                this.contractAddresses.WithdrawInterpreter,
                 this.nonce,
+                encodedOutcome,
+                encodedParams,
             ]),
@@ -311,0 +312,0 @@ operation: types.MultisigOperation.DelegateCall,

dist/src/WithdrawApp/withdrawCommitment.d.ts

 import { MultisigCommitment } from "@connext/contracts";
-import { MultisigTransaction, ContractAddresses } from "@connext/types";
-import { BigNumberish } from "ethers";
+import { ContractAddresses, MultisigTransaction, BigNumberish } from "@connext/types";
 export declare class WithdrawCommitment extends MultisigCommitment {
@@ -5,0 +4,0 @@ readonly contractAddresses: ContractAddresses;

dist/src/WithdrawApp/withdrawCommitment.js

 import { MultisigCommitment, ConditionalTransactionDelegateTarget } from "@connext/contracts";
-import { MultisigOperation } from "@connext/types";
+import { MultisigOperation, singleAssetSinglePartyCoinTransferEncoding, singleAssetTwoPartyCoinTransferInterpreterParamsEncoding, } from "@connext/types";
 import { utils } from "ethers";
-const { Interface } = utils;
-const iface = new Interface(ConditionalTransactionDelegateTarget.abi);
+const { defaultAbiCoder, Interface } = utils;
 export class WithdrawCommitment extends MultisigCommitment {
@@ -18,10 +17,12 @@ constructor(contractAddresses, multisigAddress, multisigOwners, recipient, assetId, amount, nonce) {
     getTransactionDetails() {
+        const encodedOutcome = defaultAbiCoder.encode([singleAssetSinglePartyCoinTransferEncoding], [[{ to: this.recipient, amount: this.amount }]]);
+        const encodedParams = defaultAbiCoder.encode([singleAssetTwoPartyCoinTransferInterpreterParamsEncoding], [{ limit: this.amount, tokenAddress: this.assetId }]);
         return {
             to: this.contractAddresses.ConditionalTransactionDelegateTarget,
             value: 0,
-            data: iface.encodeFunctionData("withdrawWrapper", [
-                this.recipient,
-                this.assetId,
-                this.amount,
+            data: new Interface(ConditionalTransactionDelegateTarget.abi).encodeFunctionData("executeWithdraw", [
+                this.contractAddresses.WithdrawInterpreter,
                 this.nonce,
+                encodedOutcome,
+                encodedParams,
             ]),
@@ -28,0 +29,0 @@ operation: MultisigOperation.DelegateCall,

package.json

 {
   "name": "@connext/apps",
-  "version": "7.0.0-alpha.2",
+  "version": "7.0.0-alpha.3-experimental",
   "description": "Connext Counterfactual Apps",
@@ -22,10 +22,10 @@ "main": "dist/index.js",
     "@connext/contracts": "3.2.3",
-    "@connext/utils": "7.0.0-alpha.2",
-    "@connext/types": "7.0.0-alpha.2",
-    "ethers": "5.0.0-beta.190",
-    "rollup": "2.12.1",
-    "@rollup/plugin-json": "4.0.3",
+    "@connext/utils": "7.0.0-alpha.3-experimental",
+    "@connext/types": "7.0.0-alpha.3-experimental",
+    "ethers": "5.0.2",
+    "rollup": "2.16.1",
+    "@rollup/plugin-json": "4.1.0",
     "rollup-plugin-typescript2": "0.27.1",
-    "typescript": "3.9.3"
+    "typescript": "3.9.5"
   }
 }

src/WithdrawApp/withdrawCommitment.ts

 import { MultisigCommitment, ConditionalTransactionDelegateTarget } from "@connext/contracts";
-import { MultisigTransaction, MultisigOperation, ContractAddresses } from "@connext/types";
-import { BigNumberish, utils } from "ethers";
+import {
+  ContractAddresses,
+  MultisigOperation,
+  MultisigTransaction,
+  singleAssetSinglePartyCoinTransferEncoding,
+  singleAssetTwoPartyCoinTransferInterpreterParamsEncoding,
+  BigNumberish,
+} from "@connext/types";
+import { utils } from "ethers";
 
-const { Interface } = utils;
+const { defaultAbiCoder, Interface } = utils;
 
-const iface = new Interface(ConditionalTransactionDelegateTarget.abi);
 export class WithdrawCommitment extends MultisigCommitment {
@@ -22,10 +28,21 @@ public constructor(
   public getTransactionDetails(): MultisigTransaction {
+    const encodedOutcome: string = defaultAbiCoder.encode(
+      [singleAssetSinglePartyCoinTransferEncoding],
+      [[{ to: this.recipient, amount: this.amount }]],
+    );
+    const encodedParams: string = defaultAbiCoder.encode(
+      [singleAssetTwoPartyCoinTransferInterpreterParamsEncoding],
+      [{ limit: this.amount, tokenAddress: this.assetId }],
+    );
+
     return {
       to: this.contractAddresses.ConditionalTransactionDelegateTarget,
       value: 0,
-      data: iface.encodeFunctionData("withdrawWrapper", [
-        this.recipient,
-        this.assetId,
-        this.amount,
+      data: new Interface(
+        ConditionalTransactionDelegateTarget.abi,
+      ).encodeFunctionData("executeWithdraw", [
+        this.contractAddresses.WithdrawInterpreter,
         this.nonce,
+        encodedOutcome,
+        encodedParams,
       ]),
@@ -32,0 +49,0 @@ operation: MultisigOperation.DelegateCall,

No alert changes

Improved metrics

Lines of code

2802

increased by0.68%

Worsened metrics

Total package byte prevSize

682838

decreased by-2.81%

No dependency changes