diff --git a/.changeset/hungry-lizards-obey.md b/.changeset/hungry-lizards-obey.md new file mode 100644 index 00000000..9579809b --- /dev/null +++ b/.changeset/hungry-lizards-obey.md @@ -0,0 +1,5 @@ +--- +'@safe-global/safe-apps-provider': patch +--- + +fallback `value` and `data` were overwritten with `undefined` diff --git a/packages/safe-apps-provider/dist/provider.js b/packages/safe-apps-provider/dist/provider.js index bfc157eb..3a8f1a50 100644 --- a/packages/safe-apps-provider/dist/provider.js +++ b/packages/safe-apps-provider/dist/provider.js @@ -60,7 +60,8 @@ class SafeAppProvider extends events_1.EventEmitter { return signature || '0x'; } case 'eth_sendTransaction': - const tx = Object.assign({ value: '0', data: '0x' }, params[0]); + // `value` or `data` can be explicitly set as `undefined` for example in Viem. The spread will overwrite the fallback value. + const tx = Object.assign(Object.assign({}, params[0]), { value: params[0].value || '0', data: params[0].data || '0x' }); // Some ethereum libraries might pass the gas as a hex-encoded string // We need to convert it to a number because the SDK expects a number and our backend only supports // Decimal numbers diff --git a/packages/safe-apps-provider/dist/provider.js.map b/packages/safe-apps-provider/dist/provider.js.map index ec3fcc3d..83bb7168 100644 --- a/packages/safe-apps-provider/dist/provider.js.map +++ b/packages/safe-apps-provider/dist/provider.js.map @@ -1 +1 @@ -{"version":3,"file":"provider.js","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"provider.js","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":";;;AACA,mCAAsC;AAEtC,mCAAuC;AAEvC,+GAA+G;AAC/G,MAAa,eAAgB,SAAQ,qBAAY;IAK/C,YAAY,IAAc,EAAE,GAAgB;QAC1C,KAAK,EAAE,CAAC;QAHF,iBAAY,GAAG,IAAI,GAAG,EAAiC,CAAC;QAI9D,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAChD,OAAO;IACT,CAAC;IAED,KAAK,CAAC,UAAU;QACd,OAAO;IACT,CAAC;IAED,IAAW,OAAO;QAChB,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;IAC3B,CAAC;IAED,8DAA8D;IAC9D,KAAK,CAAC,OAAO,CAAC,OAA2C;QACvD,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC;QAExC,QAAQ,MAAM,EAAE;YACd,KAAK,cAAc;gBACjB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAEjC,KAAK,aAAa,CAAC;YACnB,KAAK,aAAa;gBAChB,OAAO,KAAK,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;YAE1C,KAAK,eAAe,CAAC,CAAC;gBACpB,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC;gBAElC,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC,WAAW,EAAE,EAAE;oBACjE,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;iBAC3D;gBAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;gBACzD,MAAM,SAAS,GAAG,WAAW,IAAI,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;gBAE3E,OAAO,SAAS,IAAI,IAAI,CAAC;aAC1B;YAED,KAAK,UAAU,CAAC,CAAC;gBACf,MAAM,CAAC,OAAO,EAAE,WAAW,CAAC,GAAG,MAAM,CAAC;gBAEtC,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;oBAClG,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;iBAC3D;gBAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;gBAC7D,MAAM,SAAS,GAAG,WAAW,IAAI,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;gBAE3E,OAAO,SAAS,IAAI,IAAI,CAAC;aAC1B;YAED,KAAK,mBAAmB,CAAC;YACzB,KAAK,sBAAsB,CAAC,CAAC;gBAC3B,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,GAAG,MAAM,CAAC;gBACpC,MAAM,eAAe,GAAG,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gBAE1F,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC,WAAW,EAAE,EAAE;oBACjE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;iBAC3C;gBAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC;gBACtE,MAAM,SAAS,GAAG,WAAW,IAAI,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;gBAC3E,OAAO,SAAS,IAAI,IAAI,CAAC;aAC1B;YAED,KAAK,qBAAqB;gBACxB,4HAA4H;gBAC5H,MAAM,EAAE,mCACH,MAAM,CAAC,CAAC,CAAC,KACZ,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,EAC7B,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,IAAI,GAC7B,CAAC;gBAEF,qEAAqE;gBACrE,mGAAmG;gBACnG,kBAAkB;gBAClB,IAAI,OAAO,EAAE,CAAC,GAAG,KAAK,QAAQ,IAAI,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;oBACzD,EAAE,CAAC,GAAG,GAAG,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;iBAC/B;gBAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC;oBACnC,GAAG,EAAE,CAAC,EAAE,CAAC;oBACT,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC,GAAG,EAAE;iBAC9B,CAAC,CAAC;gBAEH,yBAAyB;gBACzB,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE;oBACrC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW;oBAC3B,IAAI,EAAE,IAAI,CAAC,UAAU;oBACrB,GAAG,EAAE,CAAC;oBACN,QAAQ,EAAE,MAAM;oBAChB,KAAK,EAAE,CAAC;oBACR,KAAK,EAAE,EAAE,CAAC,IAAI;oBACd,KAAK,EAAE,EAAE,CAAC,KAAK;oBACf,EAAE,EAAE,EAAE,CAAC,EAAE;oBACT,SAAS,EAAE,IAAI;oBACf,WAAW,EAAE,IAAI;oBACjB,gBAAgB,EAAE,IAAI;iBACvB,CAAC,CAAC;gBACH,OAAO,IAAI,CAAC,UAAU,CAAC;YAEzB,KAAK,iBAAiB;gBACpB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAE9D,OAAO,KAAK,CAAC,MAAM,CAAC;YAEtB,KAAK,gBAAgB;gBACnB,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAA,oBAAY,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAEvE,KAAK,aAAa;gBAChB,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,IAAA,oBAAY,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAEpE,KAAK,yBAAyB;gBAC5B,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,IAAA,oBAAY,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAEhF,KAAK,kBAAkB;gBACrB,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,IAAA,oBAAY,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAEpF,KAAK,sBAAsB;gBACzB,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAE/D,KAAK,oBAAoB;gBACvB,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAE7D,KAAK,0BAA0B;gBAC7B,IAAI,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBACvB,IAAI;oBACF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;oBACxD,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC;iBAChC;gBAAC,OAAO,CAAC,EAAE,GAAE;gBACd,uDAAuD;gBACvD,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;oBACjC,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;iBACtC;gBACD,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE;oBAC7D,wEAAwE;oBACxE,IAAI,EAAE,EAAE;wBACN,EAAE,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;qBACrB;oBACD,OAAO,EAAE,CAAC;gBACZ,CAAC,CAAC,CAAC;YAEL,KAAK,2BAA2B,CAAC,CAAC;gBAChC,IAAI,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBACvB,IAAI;oBACF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;oBACxD,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC;iBAChC;gBAAC,OAAO,CAAC,EAAE,GAAE;gBACd,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE;oBAC9D,wEAAwE;oBACxE,IAAI,EAAE,EAAE;wBACN,EAAE,CAAC,eAAe,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;qBAChC;oBACD,OAAO,EAAE,CAAC;gBACZ,CAAC,CAAC,CAAC;aACJ;YAED,KAAK,iBAAiB,CAAC,CAAC;gBACtB,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;aAC/C;YAED,KAAK,UAAU,CAAC,CAAC;gBACf,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aAClD;YAED,KAAK,aAAa;gBAChB,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAE/C,KAAK,cAAc;gBACjB,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;YAEpC,KAAK,uBAAuB;gBAC1B,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;YAE1C,KAAK,2BAA2B;gBAC9B,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YAEvD,KAAK,kBAAkB;gBACrB,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAEnD;gBACE,MAAM,KAAK,CAAC,IAAI,OAAO,CAAC,MAAM,mBAAmB,CAAC,CAAC;SACtD;IACH,CAAC;IAED,sCAAsC;IACtC,iIAAiI;IACjI,IAAI,CAAC,OAAY,EAAE,QAA8C;QAC/D,IAAI,CAAC,OAAO;YAAE,QAAQ,CAAC,mBAAmB,CAAC,CAAC;QAC5C,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;aAClB,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;aAC5E,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;IAC7C,CAAC;CACF;AA5MD,0CA4MC"} \ No newline at end of file diff --git a/packages/safe-apps-provider/src/provider.ts b/packages/safe-apps-provider/src/provider.ts index 74b0135c..01cee58e 100644 --- a/packages/safe-apps-provider/src/provider.ts +++ b/packages/safe-apps-provider/src/provider.ts @@ -81,10 +81,11 @@ export class SafeAppProvider extends EventEmitter implements EIP1193Provider { } case 'eth_sendTransaction': + // `value` or `data` can be explicitly set as `undefined` for example in Viem. The spread will overwrite the fallback value. const tx = { - value: '0', - data: '0x', ...params[0], + value: params[0].value || '0', + data: params[0].data || '0x', }; // Some ethereum libraries might pass the gas as a hex-encoded string